From: Dave Watson Date: Thu, 18 Dec 2014 19:13:55 +0000 (-0800) Subject: fix make test X-Git-Tag: v0.22.0~87 X-Git-Url: http://plrg.eecs.uci.edu/git/?a=commitdiff_plain;h=ee2704c5d3817242e2599670683ca571848346ab;p=folly.git fix make test Summary: autotools is fun. rule name has to match Test Plan: No contbuild for this, only a jenkins hourly build: https://ci-builds.fb.com/job/folly/ Reviewed By: noamler@fb.com Subscribers: doug, net-systems@, folly-diffs@ FB internal diff: D1747221 Signature: t1:1747221:1418929497:a29320b5e21a657fe7e0221d2bea8b332626627b --- diff --git a/folly/test/Makefile.am b/folly/test/Makefile.am index 151e8362..6dfd6e61 100644 --- a/folly/test/Makefile.am +++ b/folly/test/Makefile.am @@ -15,7 +15,7 @@ TESTS= \ bit_iterator_test check_LTLIBRARIES = libgtestmain.la libgtest.la -check_PROGRAMS = +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 @@ -26,8 +26,8 @@ libgtest_la_SOURCES = gtest-1.6.0/src/gtest-all.cc noinst_HEADERS = FBStringTestBenchmarks.cpp.h \ FBVectorTestBenchmarks.cpp.h -small_locks_test_SOURCES = SpinLockTest.cpp -small_locks_test_LDADD = libgtestmain.la $(top_builddir)/libfolly.la +spin_lock_test_SOURCES = SpinLockTest.cpp +spin_lock_test_LDADD = libgtestmain.la $(top_builddir)/libfolly.la TESTS += spin_lock_test if HAVE_X86_64