Summary: There is slight drift in external deps between the TARGETS and automake files, keeping tests from linking in the 'make check' step when building folly outside of fbcode.
Reviewed By: yfeldblum
Differential Revision:
D2740482
fb-gh-sync-id:
ae6243f9bb112a7d2680017b3d577a1f23ef4f60
# check for boost libs
AX_BOOST_BASE([1.51.0], [], [AC_MSG_ERROR(
# check for boost libs
AX_BOOST_BASE([1.51.0], [], [AC_MSG_ERROR(
- [Please install boost >= 1.51.0 (context, thread, program_options, regex, and system)])])
+ [Please install boost >= 1.51.0 (context, thread, program_options, regex, system and chrono)])])
AX_BOOST_CONTEXT
AX_BOOST_PROGRAM_OPTIONS
AX_BOOST_THREAD
AX_BOOST_REGEX
AX_BOOST_SYSTEM
AX_BOOST_FILESYSTEM
AX_BOOST_CONTEXT
AX_BOOST_PROGRAM_OPTIONS
AX_BOOST_THREAD
AX_BOOST_REGEX
AX_BOOST_SYSTEM
AX_BOOST_FILESYSTEM
# Check for python interpreter
AM_PATH_PYTHON
# Check for python interpreter
AM_PATH_PYTHON
AM_LDFLAGS="$AM_LDFLAGS $BOOST_CONTEXT_LIB $BOOST_PROGRAM_OPTIONS_LIB"
AM_LDFLAGS="$AM_LDFLAGS $BOOST_THREAD_LIB $BOOST_FILESYSTEM_LIB"
AM_LDFLAGS="$AM_LDFLAGS $BOOST_SYSTEM_LIB $BOOST_REGEX_LIB -lpthread"
AM_LDFLAGS="$AM_LDFLAGS $BOOST_CONTEXT_LIB $BOOST_PROGRAM_OPTIONS_LIB"
AM_LDFLAGS="$AM_LDFLAGS $BOOST_THREAD_LIB $BOOST_FILESYSTEM_LIB"
AM_LDFLAGS="$AM_LDFLAGS $BOOST_SYSTEM_LIB $BOOST_REGEX_LIB -lpthread"
+AM_LDFLAGS="$AM_LDFLAGS $BOOST_CHRONO_LIB"
AC_SUBST([AM_CPPFLAGS])
AC_SUBST([AM_LDFLAGS])
AC_SUBST([AM_CPPFLAGS])
AC_SUBST([AM_LDFLAGS])
thread_local_test_SOURCES = ThreadLocalTest.cpp
thread_local_test_LDADD = libgtestmain.la $(top_builddir)/libfollybenchmark.la $(top_builddir)/libfolly.la
thread_local_test_SOURCES = ThreadLocalTest.cpp
thread_local_test_LDADD = libgtestmain.la $(top_builddir)/libfollybenchmark.la $(top_builddir)/libfolly.la
+thread_local_test_LDFLAGS = -ldl
TESTS += thread_cached_int_test thread_local_test
fbvector_test_SOURCES = FBVectorTest.cpp
TESTS += thread_cached_int_test thread_local_test
fbvector_test_SOURCES = FBVectorTest.cpp
TESTS += spooky_hash_v2_test
token_bucket_test_SOURCES = TokenBucketTest.cpp
TESTS += spooky_hash_v2_test
token_bucket_test_SOURCES = TokenBucketTest.cpp
-token_bucket_test_LDADD = libgtest.la $(top_builddir)/libfolly.la $(top_builddir)/libfollybenchmark.la
+token_bucket_test_LDADD = libgtestmain.la $(top_builddir)/libfolly.la $(top_builddir)/libfollybenchmark.la
TESTS += token_bucket_test
thread_name_test_SOURCES = ThreadNameTest.cpp
TESTS += token_bucket_test
thread_name_test_SOURCES = ThreadNameTest.cpp
-thread_name_test_LDADD = ligtest.la $(top_builddir)/libfolly.la
+thread_name_test_LDADD = libgtestmain.la $(top_builddir)/libfolly.la
TESTS += thread_name_test
TESTS += thread_name_test