From f3ac5cca652fc844c5d97f5adbcf9504cfde8cb8 Mon Sep 17 00:00:00 2001 From: Andrew Gallagher Date: Fri, 9 Jan 2015 19:25:31 -0800 Subject: [PATCH] folly: make remaining TARGETS files auto converitble to BUCK files Summary: Also add the `@buckify` tag to keep these automatically synced. Test Plan: built and tested with buck and fbconfig/fbmake Reviewed By: robbert@fb.com Subscribers: trunkagent, sdwilsh, fugalh, folly-diffs@, jsedgwick FB internal diff: D1775555 Signature: t1:1775555:1420840948:e9a2e86379be71b7d953fa53a727e51d2541b011 --- folly/io/async/test/EventBaseTest.cpp | 1 + folly/test/SpookyHashV1Test.cpp | 9 +++++---- folly/test/SpookyHashV2Test.cpp | 9 +++++---- folly/wangle/acceptor/Acceptor.h | 10 +++++----- 4 files changed, 16 insertions(+), 13 deletions(-) diff --git a/folly/io/async/test/EventBaseTest.cpp b/folly/io/async/test/EventBaseTest.cpp index a8ff23c7..c9887169 100644 --- a/folly/io/async/test/EventBaseTest.cpp +++ b/folly/io/async/test/EventBaseTest.cpp @@ -1484,6 +1484,7 @@ TEST(EventBaseTest, IdleTime) { ASSERT_EQ(7, tos0.getTimeouts()); ASSERT_GE(5900, eventBase.getAvgLoopTime() - 1200); ASSERT_LE(5900, eventBase.getAvgLoopTime() + 1200); + ASSERT_TRUE(!!tos); ASSERT_EQ(21, tos->getTimeouts()); } diff --git a/folly/test/SpookyHashV1Test.cpp b/folly/test/SpookyHashV1Test.cpp index 804836f6..d55a1b93 100644 --- a/folly/test/SpookyHashV1Test.cpp +++ b/folly/test/SpookyHashV1Test.cpp @@ -30,6 +30,8 @@ #include #include +#include + using namespace ::folly::hash; static bool failed = false; @@ -532,16 +534,15 @@ void TestPieces() } #undef BUFSIZE -int main(int argc, const char **argv) -{ +TEST(SpookyHashV1, Main) { TestResults(); TestAlignment(); TestPieces(); - DoTimingBig(argc); + DoTimingBig(1); // tudorb@fb.com: Commented out slow tests #if 0 DoTimingSmall(argc); TestDeltas(argc); #endif - return failed; + CHECK_EQ(failed, 0); } diff --git a/folly/test/SpookyHashV2Test.cpp b/folly/test/SpookyHashV2Test.cpp index eaa27ace..be6cde1c 100644 --- a/folly/test/SpookyHashV2Test.cpp +++ b/folly/test/SpookyHashV2Test.cpp @@ -30,6 +30,8 @@ #include #include +#include + using namespace ::folly::hash; static bool failed = false; @@ -522,16 +524,15 @@ void TestPieces() } #undef BUFSIZE -int main(int argc, const char **argv) -{ +TEST(SpookyHashV2, Main) { TestResults(); TestAlignment(); TestPieces(); - DoTimingBig(argc); + DoTimingBig(1); // tudorb@fb.com: Commented out slow tests #if 0 DoTimingSmall(argc); TestDeltas(argc); #endif - return failed; + CHECK_EQ(failed, 0); } diff --git a/folly/wangle/acceptor/Acceptor.h b/folly/wangle/acceptor/Acceptor.h index 9c4563ba..23d8ee02 100644 --- a/folly/wangle/acceptor/Acceptor.h +++ b/folly/wangle/acceptor/Acceptor.h @@ -9,12 +9,12 @@ */ #pragma once -#include "folly/wangle/acceptor/ServerSocketConfig.h" -#include "folly/wangle/acceptor/ConnectionCounter.h" +#include +#include #include -#include "folly/wangle/acceptor/LoadShedConfiguration.h" -#include "folly/wangle/ssl/SSLCacheProvider.h" -#include "folly/wangle/acceptor/TransportInfo.h" +#include +#include +#include #include #include -- 2.34.1