From: Nicholas Ormrod Date: Fri, 17 Apr 2015 00:35:29 +0000 (-0700) Subject: Adds x64 arch-specific test X-Git-Tag: v0.36.0~29 X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=90bd93907a845cb0b2effcb6634b859d24cb224d;p=folly.git Adds x64 arch-specific test Summary: Adds x64 arch-specific test inside the if HAVE_X86_64 Signed-off-by: Nicholas Ormrod Test Plan: tests Reviewed By: markisaa@fb.com Subscribers: folly-diffs@, yfeldblum, chalfant FB internal diff: D1999428 Tasks: 6783581 Signature: t1:1999428:1429220350:4287342a5a99823c9e4ffe20d0e47039f9fdbc0b --- diff --git a/folly/test/Makefile.am b/folly/test/Makefile.am index f38b185d..51f61acd 100644 --- a/folly/test/Makefile.am +++ b/folly/test/Makefile.am @@ -47,6 +47,10 @@ TESTS += small_vector_test discriminated_ptr_test_SOURCES = DiscriminatedPtrTest.cpp discriminated_ptr_test_LDADD = libgtestmain.la $(top_builddir)/libfolly.la TESTS += discriminated_ptr_test + +cpuid_test_SOURCES = CpuIdTest.cpp +cpuid_test_LDADD = libgtestmain.la $(top_builddir)/libfolly.la +TESTS += cpuid_test endif sorted_vector_types_test_SOURCES = sorted_vector_test.cpp @@ -170,10 +174,6 @@ portability_test_SOURCES = PortabilityTest.cpp portability_test_LDADD = libgtestmain.la $(top_builddir)/libfolly.la TESTS += portability_test -cpuid_test_SOURCES = CpuIdTest.cpp -cpuid_test_LDADD = libgtestmain.la $(top_builddir)/libfolly.la -TESTS += cpuid_test - spooky_hash_v1_test_SOURCES = SpookyHashV1Test.cpp spooky_hash_v1_test_LDADD = libgtestmain.la $(top_builddir)/libfolly.la $(top_builddir)/libfollybenchmark.la TESTS += spooky_hash_v1_test