From: Adam Simpkins <simpkins@fb.com>
Date: Fri, 1 Jul 2016 22:02:40 +0000 (-0700)
Subject: fix the ThreadLocal test in open source builds
X-Git-Tag: 2016.07.26~89
X-Git-Url: http://plrg.eecs.uci.edu/git/?a=commitdiff_plain;h=df7b6d2a825043fdd63214ea55db803df3826eed;p=folly.git

fix the ThreadLocal test in open source builds

Summary:
The ThreadLocalTest has been broken in open source builds ever since D2678401,
because Makefile.am was never updated to build the helper shared library needed
by the test.

This updates Makefile.am to build the shared library.

Reviewed By: yfeldblum

Differential Revision: D3511125

fbshipit-source-id: 4684dbc32acf6ffbfc07079da91a1da480259502
---

diff --git a/folly/test/Makefile.am b/folly/test/Makefile.am
index 787821bd..1857b32b 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