Commit 5dd16dc0 authored by Adam Simpkins's avatar Adam Simpkins Committed by Facebook Github Bot

fix issues with the open source tests

Summary:
Fix build problems in the open source Makefiles that cause issues when running
`make check`

- The test subdirectory needs to be processed before experimental, since some
  tests in experimental/ depend on libfollytestmain from test/
- The stats/test Makefile had an incorrectly copy-and-pasted line for
  libgtest_la_SOURCES but didn't actually build a libgtest.la library.
- The test/ Makefile defined thread_id_test but forgot to add it to TESTS so
  that it would actually be run as part of "make check"

Reviewed By: Orvid

Differential Revision: D5249132

fbshipit-source-id: 5a71e1f72a39d5407b843a5876891c67238ec006
parent f47a8a52
......@@ -2,7 +2,10 @@ if FOLLY_TESTMAIN
MAYBE_INIT = init
endif
SUBDIRS = . experimental $(MAYBE_INIT) test io/test stats/test
# Note that the order of SUBDIRS matters.
# Many subdirectories depend on libfollytest from the test directory,
# so it must appear before other directories
SUBDIRS = . test experimental $(MAYBE_INIT) io/test stats/test
ACLOCAL_AMFLAGS = -I m4
......
......@@ -3,8 +3,6 @@ ACLOCAL_AMFLAGS = -I m4
CPPFLAGS = -I$(top_srcdir)/test/gtest/googletest/include
ldadd = $(top_builddir)/test/libfollytestmain.la
libgtest_la_SOURCES = gtest/googletest/src/gtest-all.cc
check_PROGRAMS = \
histogram_test
......
......@@ -98,6 +98,7 @@ thread_cached_int_test_LDADD = libfollytestmain.la $(top_builddir)/libfollybench
thread_id_test_SOURCES = ThreadIdTest.cpp
thread_id_test_LDADD = libfollytestmain.la
TESTS += thread_id_test
thread_local_test_SOURCES = ThreadLocalTest.cpp
thread_local_test_LDADD = libfollytestmain.la $(top_builddir)/libfollybenchmark.la
......
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