From 2adc448985b71cb2f5eff52b691cd3307860a144 Mon Sep 17 00:00:00 2001 From: Brian Aker Date: Fri, 29 Jul 2011 13:17:12 -0700 Subject: [PATCH] Merge in C test. --- .bzrignore | 11 +++++----- tests/c_test.c | 53 ++++++++++++++++++++++++++++++++++++++++++++++++ tests/include.am | 6 ++++++ 3 files changed, 65 insertions(+), 5 deletions(-) create mode 100644 tests/c_test.c diff --git a/.bzrignore b/.bzrignore index e1a61fbc..42903be0 100644 --- a/.bzrignore +++ b/.bzrignore @@ -3,6 +3,7 @@ *.THIS *.exe *.lo +*.orig *.output *.pop *.rpm @@ -19,8 +20,8 @@ *TAGS .deps .hg/ -.hgsub .hgignore +.hgsub .hgsubstate INSTALL Makefile @@ -88,6 +89,7 @@ ltoptions.m4 ltsugar.m4 ltversion.m4 lt~obsolete.m4 +out patch patch2 stamp-h1 @@ -98,10 +100,13 @@ support/libmemcached.pc support/libmemcached.spec tags tests/atomsmasher +tests/c_test tests/cycle tests/hash_plus tests/hashplus +tests/memcapable tests/memplus +tests/memslap tests/output.cmp tests/startservers tests/testapp @@ -110,7 +115,3 @@ tests/testplus tests/testudp tests/var/ unittests/unittests -out -*.orig -tests/memcapable -tests/memslap diff --git a/tests/c_test.c b/tests/c_test.c new file mode 100644 index 00000000..066eb6c1 --- /dev/null +++ b/tests/c_test.c @@ -0,0 +1,53 @@ +/* vim:expandtab:shiftwidth=2:tabstop=2:smarttab: + * + * Libmemcached C test app + * + * Copyright (C) 2011 Data Differential, http://datadifferential.com/ + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are + * met: + * + * * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * + * * Redistributions in binary form must reproduce the above + * copyright notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. + * + * * The names of its contributors may not be used to endorse or + * promote products derived from this software without specific prior + * written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR + * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT + * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, + * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT + * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, + * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY + * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE + * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + * + */ + +/* + * @file @brief C dummy test, aka testing C linking, etc + */ + +#include + +#include + +int main(void) +{ + (void)memcached_success(MEMCACHED_SUCCESS); + (void)memcached_failed(MEMCACHED_SUCCESS); + (void)memcached_continue(MEMCACHED_SUCCESS); + + return EXIT_SUCCESS; +} + diff --git a/tests/include.am b/tests/include.am index 2dfb8f38..ebeeb620 100644 --- a/tests/include.am +++ b/tests/include.am @@ -130,6 +130,12 @@ tests_memslap_DEPENDENCIES= libtest/libtest.la $(TESTS_LDADDS) tests_memslap_LDADD= $(tests_memslap_DEPENDENCIES) check_PROGRAMS+= tests/memslap noinst_PROGRAMS+= tests/memslap + +# Test linking with C application +tests_c_test_SOURCES= tests/c_test.c +tests_c_test_LDADD= ${CLIENT_LDADD} +check_PROGRAMS+=tests/c_test +noinst_PROGRAMS+=tests/c_test test: check -- 2.30.2