Commit df7b6d2a authored by Adam Simpkins's avatar Adam Simpkins Committed by Facebook Github Bot 8

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
parent 0b14cc4f
...@@ -16,6 +16,7 @@ TESTS= \ ...@@ -16,6 +16,7 @@ TESTS= \
check_LTLIBRARIES = libfollytestmain.la libgtest.la check_LTLIBRARIES = libfollytestmain.la libgtest.la
check_PROGRAMS = check_PROGRAMS =
noinst_LTLIBRARIES = lib_thread_local_test.la
libgtest_la_CPPFLAGS = -Igtest-1.7.0 -Igtest-1.7.0/src libgtest_la_CPPFLAGS = -Igtest-1.7.0 -Igtest-1.7.0/src
libgtest_la_SOURCES = gtest-1.7.0/src/gtest-all.cc 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. ...@@ -30,6 +31,11 @@ libfollytestmain_la_SOURCES = $(libgtest_la_SOURCES) gtest-1.7.0/src/gtest_main.
libfollytestmain_la_LIBADD = $(top_builddir)/libfolly.la libfollytestmain_la_LIBADD = $(top_builddir)/libfolly.la
endif 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 \ noinst_HEADERS = FBStringTestBenchmarks.cpp.h \
FBVectorTestBenchmarks.cpp.h FBVectorTestBenchmarks.cpp.h
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment