Commit d175e4ac authored by Dave Watson's avatar Dave Watson Committed by Tudor Bosman

update make check targets

Summary:
Update targets so that gtest isn't required unless you run 'make check'.

Simply make everything that uses gtest a 'check_PROGRAM' instead of a 'noinst_PROGRAM'

Test Plan: build folly with 'make -j32', gtest isn't required.

Reviewed By: andrewjcg@fb.com

Subscribers: pavlo, doug

FB internal diff: D1408288
parent 4bfe9433
......@@ -14,7 +14,8 @@ TESTS= \
bits_test \
bit_iterator_test
noinst_LTLIBRARIES = libgtestmain.la libgtest.la
check_LTLIBRARIES = libgtestmain.la libgtest.la
check_PROGRAMS =
libgtestmain_la_CPPFLAGS = -Igtest-1.6.0 -Igtest-1.6.0/src
libgtestmain_la_SOURCES = gtest-1.6.0/src/gtest-all.cc gtest-1.6.0/src/gtest_main.cc
......@@ -25,8 +26,6 @@ libgtest_la_SOURCES = gtest-1.6.0/src/gtest-all.cc
noinst_HEADERS = FBStringTestBenchmarks.cpp.h \
FBVectorTestBenchmarks.cpp.h
noinst_PROGRAMS=benchmark_test
if HAVE_X86_64
small_locks_test_SOURCES = SmallLocksTest.cpp
small_locks_test_LDADD = libgtestmain.la $(top_builddir)/libfolly.la
......@@ -85,6 +84,7 @@ TESTS += json_test
benchmark_test_SOURCES = BenchmarkTest.cpp
benchmark_test_LDADD = libgtestmain.la $(top_builddir)/libfollybenchmark.la $(top_builddir)/libfolly.la
check_PROGRAMS += benchmark_test
# fails due to destructor
scope_guard_test_SOURCES = ScopeGuardTest.cpp
......@@ -124,7 +124,7 @@ TESTS += concurrent_skiplist_test
concurrent_skiplist_benchmark_SOURCES = ConcurrentSkipListBenchmark.cpp
concurrent_skiplist_benchmark_LDADD = $(top_builddir)/libfollybenchmark.la $(top_builddir)/libfolly.la
noinst_PROGRAMS += concurrent_skiplist_benchmark
check_PROGRAMS += concurrent_skiplist_benchmark
histogram_test_SOURCES = HistogramTest.cpp
histogram_test_LDADD = libgtestmain.la $(top_builddir)/libfolly.la
......@@ -178,4 +178,4 @@ spooky_hash_v2_test_SOURCES = SpookyHashV2Test.cpp
spooky_hash_v2_test_LDADD = $(top_builddir)/libfolly.la $(top_builddir)/libfollybenchmark.la
TESTS += spooky_hash_v2_test
check_PROGRAMS= $(TESTS)
check_PROGRAMS += $(TESTS)
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