Fix OSS's "make check"

Reviewed By: yfeldblum

Differential Revision: D6182541

fbshipit-source-id: 31d255819df1f97b13e475903c0627a1ac96b516

diff --git a/folly/io/test/Makefile.am b/folly/io/test/Makefile.am
index 7c469e3f2156ed66b81801c1477cb9b0c2f65a65..0dc60e60fdbe0062593c7fd322bfec4ce9362661 100644 (file)
--- a/folly/io/test/Makefile.am
+++ b/folly/io/test/Makefile.am
@@ -20,7 +20,7 @@ iobuf_test_LDADD = $(ldadd)
 iobuf_cursor_test_SOURCES = IOBufCursorTest.cpp
 iobuf_cursor_test_LDADD = $(ldadd)
 
 iobuf_cursor_test_SOURCES = IOBufCursorTest.cpp
 iobuf_cursor_test_LDADD = $(ldadd)
 

-compression_test_SOURCES = CompressionTest.cpp
+compression_test_SOURCES = ../../compression/test/CompressionTest.cpp

 compression_test_LDADD = $(top_builddir)/libfolly.la \
                         $(top_builddir)/test/libgtest.la \
                         $(top_builddir)/libfollybenchmark.la
 compression_test_LDADD = $(top_builddir)/libfolly.la \
                         $(top_builddir)/test/libgtest.la \
                         $(top_builddir)/libfollybenchmark.la

diff --git a/folly/test/Makefile.am b/folly/test/Makefile.am
index b55bc800d4826b362b91ffc961d257bffc22c678..dc49c5f896455554584dd1b68e333419f3f4ec2e 100644 (file)
--- a/folly/test/Makefile.am
+++ b/folly/test/Makefile.am
@@ -89,7 +89,7 @@ foreach_benchmark_SOURCES = ../container/test/ForeachBenchmark.cpp
 foreach_benchmark_LDADD = libfollytestmain.la $(top_builddir)/libfollybenchmark.la
 check_PROGRAMS += foreach_benchmark
 
 foreach_benchmark_LDADD = libfollytestmain.la $(top_builddir)/libfollybenchmark.la
 check_PROGRAMS += foreach_benchmark
 

-hash_test_SOURCES = HashTest.cpp
+hash_test_SOURCES = ../hash/test/HashTest.cpp

 hash_test_LDADD = libfollytestmain.la
 
 invoke_test_SOURCES = ../functional/test/InvokeTest.cpp
 hash_test_LDADD = libfollytestmain.la
 
 invoke_test_SOURCES = ../functional/test/InvokeTest.cpp


@@ -102,7 +102,7 @@ TESTS += fbstring_test_using_jemalloc
 thread_cached_int_test_SOURCES = ThreadCachedIntTest.cpp
 thread_cached_int_test_LDADD = libfollytestmain.la $(top_builddir)/libfollybenchmark.la
 
 thread_cached_int_test_SOURCES = ThreadCachedIntTest.cpp
 thread_cached_int_test_LDADD = libfollytestmain.la $(top_builddir)/libfollybenchmark.la
 

-thread_id_test_SOURCES = system/test/ThreadIdTest.cpp
+thread_id_test_SOURCES = ../system/test/ThreadIdTest.cpp

 thread_id_test_LDADD = libfollytestmain.la
 TESTS += thread_id_test
 
 thread_id_test_LDADD = libfollytestmain.la
 TESTS += thread_id_test
 


@@ -243,7 +243,7 @@ token_bucket_test_SOURCES = TokenBucketTest.cpp
 token_bucket_test_LDADD = libfollytestmain.la  $(top_builddir)/libfollybenchmark.la
 TESTS += token_bucket_test
 
 token_bucket_test_LDADD = libfollytestmain.la  $(top_builddir)/libfollybenchmark.la
 TESTS += token_bucket_test
 

-thread_name_test_SOURCES = system/ThreadNameTest.cpp
+thread_name_test_SOURCES = ../system/test/ThreadNameTest.cpp

 thread_name_test_LDADD = libfollytestmain.la
 TESTS += thread_name_test
 
 thread_name_test_LDADD = libfollytestmain.la
 TESTS += thread_name_test
 


@@ -340,11 +340,11 @@ mallctl_helper_test_SOURCES = ../memory/test/MallctlHelperTest.cpp
 mallctl_helper_test_LDADD = libfollytestmain.la
 TESTS += mallctl_helper_test
 
 mallctl_helper_test_LDADD = libfollytestmain.la
 TESTS += mallctl_helper_test
 

-apply_tuple_test_SOURCES = ApplyTupleTest.cpp
+apply_tuple_test_SOURCES = ../functional/test/ApplyTupleTest.cpp

 apply_tuple_test_LDADD = libfollytestmain.la
 TESTS += apply_tuple_test
 
 apply_tuple_test_LDADD = libfollytestmain.la
 TESTS += apply_tuple_test
 

-partial_test_SOURCES = PartialTest.cpp
+partial_test_SOURCES = ../functional/test/PartialTest.cpp

 partial_test_LDADD = libfollytestmain.la
 TESTS += partial_test
 
 partial_test_LDADD = libfollytestmain.la
 TESTS += partial_test
 


@@ -356,7 +356,7 @@ utility_test_SOURCES = UtilityTest.cpp
 utility_test_LDADD = libfollytestmain.la
 TESTS += utility_test
 
 utility_test_LDADD = libfollytestmain.la
 TESTS += utility_test
 

-iterator_test_SOURCES = IteratorTest.cpp
+iterator_test_SOURCES = ../container/test/IteratorTest.cpp

 iterator_test_LDADD = libfollytestmain.la
 TESTS += iterator_test
 
 iterator_test_LDADD = libfollytestmain.la
 TESTS += iterator_test