X-Git-Url: http://demsky.eecs.uci.edu/git/?a=blobdiff_plain;f=folly%2Ftest%2FMakefile.am;h=d11b13d68b09551473f00f6c981d98a3cedf4094;hb=26b139fc3520828f080d459b0f8cbd271cab7a89;hp=7a39a8209b106a491e66e0e184efca4f1573d879;hpb=cc5485f8934b5a6024a80ac2cea147aa7816c0c8;p=folly.git

diff --git a/folly/test/Makefile.am b/folly/test/Makefile.am
index 7a39a820..d11b13d6 100644
--- a/folly/test/Makefile.am
+++ b/folly/test/Makefile.am
@@ -16,6 +16,7 @@ TESTS= \
 
 check_LTLIBRARIES = libfollytestmain.la libgtest.la
 check_PROGRAMS =
+noinst_LTLIBRARIES = lib_thread_local_test.la
 
 libgtest_la_CPPFLAGS = -Igtest-1.7.0 -Igtest-1.7.0/src
 libgtest_la_SOURCES = gtest-1.7.0/src/gtest-all.cc
@@ -30,6 +31,11 @@ libfollytestmain_la_SOURCES = $(libgtest_la_SOURCES) gtest-1.7.0/src/gtest_main.
 libfollytestmain_la_LIBADD = $(top_builddir)/libfolly.la
 endif
 
+lib_thread_local_test_la_CPPFLAGS = $(AM_CPPFLAGS)
+lib_thread_local_test_la_SOURCES = ThreadLocalTestLib.cpp
+lib_thread_local_test_la_LDFLAGS = -rpath /force_shared
+lib_thread_local_test_la_LIBADD = $(top_builddir)/libfolly.la
+
 noinst_HEADERS = FBStringTestBenchmarks.cpp.h \
 	FBVectorTestBenchmarks.cpp.h
 
@@ -143,6 +149,10 @@ synchronized_test_SOURCES = SynchronizedTest.cpp
 synchronized_test_LDADD = libfollytestmain.la
 TESTS += synchronized_test
 
+lock_traits_test_SOURCES = LockTraitsTest.cpp
+lock_traits_test_LDADD = libfollytestmain.la
+TESTS += lock_traits_test
+
 concurrent_skiplist_test_SOURCES = ConcurrentSkipListTest.cpp
 concurrent_skiplist_test_LDADD = libfollytestmain.la
 TESTS += concurrent_skiplist_test
@@ -219,6 +229,10 @@ indestructible_test_SOURCES = IndestructibleTest.cpp
 indestructible_test_LDADD = libfollytestmain.la
 TESTS += indestructible_test
 
+portability_time_test_SOURCES = ../portability/test/TimeTest.cpp
+portability_time_test_LDADD = libfollytestmain.la
+TESTS += portability_time_test
+
 try_test_SOURCES = TryTest.cpp
 try_test_LDADD = libfollytestmain.la
 TESTS += try_test
@@ -267,8 +281,8 @@ function_test_LDADD = libfollytestmain.la
 TESTS += function_test
 
 ssl_test_SOURCES = \
-		../ssl/OpenSSLHashTest.cpp
-ssl_test_LDADD = libfollytestmain.la
+		../ssl/test/OpenSSLHashTest.cpp
+ssl_test_LDADD = libfollytestmain.la -lcrypto
 TESTS += ssl_test
 
 check_PROGRAMS += $(TESTS)