Merge Monty (with formatting fixes)

[awesomized/libmemcached] / tests / include.am

diff --git a/tests/include.am b/tests/include.am
index b71f0c79ed83f9cba3064dc32136d3f9e6ae0798..5a65b6c21c1c90f91f9df5570f6f33448e52f951 100644 (file)
--- a/tests/include.am
+++ b/tests/include.am
@@ -15,16 +15,6 @@ TESTS_LDADDS+= libmemcached/libmemcachedutil.la
 endif
 
 EXTRA_DIST+= \
-            tests/r/memcat.res \
-            tests/r/memcp.res \
-            tests/r/memrm.res \
-            tests/r/memslap.res \
-            tests/r/memstat.res \
-            tests/t/memcat.test \
-            tests/t/memcp.test \
-            tests/t/memrm.test \
-            tests/t/memslap.test \
-            tests/t/memstat.test
 
 noinst_HEADERS+= \
                 tests/hash_results.h \
@@ -53,32 +43,33 @@ tests_libtest_la_SOURCES= tests/test.c
 tests_testapp_CFLAGS= $(AM_CFLAGS) $(NO_CONVERSION) $(NO_STRICT_ALIASING)
 tests_testapp_SOURCES= tests/mem_functions.c
 tests_testapp_DEPENDENCIES= \
-                    clients/libgenexec.la \
-                    tests/libserver.la \
-                    tests/libtest.la \
-                    libmemcached/libmemcachedinternal.la \
-                     $(TESTS_LDADDS)
+                           clients/libgenexec.la \
+                           tests/libserver.la \
+                           tests/libtest.la \
+                           libmemcached/libmemcachedinternal.la \
+                           $(TESTS_LDADDS)
 tests_testapp_LDADD= $(tests_testapp_DEPENDENCIES) $(LIBSASL)
 
 tests_testplus_SOURCES= tests/plus.cpp
+tests_testplus_CXXFLAGS = $(AM_CXXFLAGS) $(NO_EFF_CXX)
 tests_testplus_DEPENDENCIES= tests/libtest.la tests/libserver.la $(TESTS_LDADDS)
 tests_testplus_LDADD= $(tests_testplus_DEPENDENCIES) $(LIBSASL)
 
 tests_atomsmasher_SOURCES= tests/atomsmasher.c
 tests_atomsmasher_DEPENDENCIES= \
-       clients/libgenexec.la \
-       tests/libserver.la \
-       tests/libtest.la \
-       $(TESTS_LDADDS)
+                               clients/libgenexec.la \
+                               tests/libserver.la \
+                               tests/libtest.la \
+                               $(TESTS_LDADDS)
 tests_atomsmasher_LDADD= $(tests_atomsmasher_DEPENDENCIES) $(LIBSASL)
 
 tests_testudp_CFLAGS= $(AM_CFLAGS) $(NO_CONVERSION) $(NO_STRICT_ALIASING)
 tests_testudp_SOURCES= tests/mem_udp.c
 tests_testudp_DEPENDENCIES= \
-       clients/libgenexec.la \
-       tests/libserver.la \
-       tests/libtest.la \
-       $(TESTS_LDADDS)
+                           clients/libgenexec.la \
+                           tests/libserver.la \
+                           tests/libtest.la \
+                           $(TESTS_LDADDS)
 tests_testudp_LDADD= $(tests_testudp_DEPENDENCIES) $(LIBSASL)
 
 tests_startservers_SOURCES= tests/start.c
@@ -90,10 +81,12 @@ tests_testhashkit_DEPENDENCIES = tests/libtest.la libhashkit/libhashkit.la
 tests_testhashkit_LDADD = $(tests_testhashkit_DEPENDENCIES) $(LIBSASL)
 
 tests_hashplus_SOURCES = tests/hash_plus.cc
+tests_hashplus_CXXFLAGS = $(AM_CXXFLAGS) $(NO_EFF_CXX)
 tests_hashplus_DEPENDENCIES = $(tests_testhashkit_DEPENDENCIES)
 tests_hashplus_LDADD = $(tests_testhashkit_DEPENDENCIES) $(LIBSASL)
 
 tests_memplus_SOURCES = tests/mem_plus.cc
+tests_memplus_CXXFLAGS = $(AM_CXXFLAGS) $(NO_EFF_CXX)
 tests_memplus_DEPENDENCIES = tests/libtest.la tests/libserver.la libmemcached/libmemcached.la
 tests_memplus_LDADD = $(tests_memplus_DEPENDENCIES)