Commit ee856474 authored by Dan Melnic's avatar Dan Melnic Committed by Facebook GitHub Bot

Avoid static init crash when compiling with clang 9.0

Summary: Avoid static init crash in testing::internal::TypedTestCasePState::VerifyRegisteredTestNames when compiling with clang 9.0 (works OK with clang-8.0)

Reviewed By: yfeldblum

Differential Revision: D26419675

fbshipit-source-id: c961ac0f73e3fc8d8852eb32c0b89634fb854c37
parent f604b03c
...@@ -470,19 +470,6 @@ TYPED_TEST_P(AsyncTest, Cancel) { ...@@ -470,19 +470,6 @@ TYPED_TEST_P(AsyncTest, Cancel) {
EXPECT_EQ(foundCompleted, completed); EXPECT_EQ(foundCompleted, completed);
} }
REGISTER_TYPED_TEST_CASE_P(
AsyncTest,
ZeroAsyncDataNotPollable,
ZeroAsyncDataPollable,
SingleAsyncDataNotPollable,
SingleAsyncDataPollable,
MultipleAsyncDataNotPollable,
MultipleAsyncDataPollable,
ManyAsyncDataNotPollable,
ManyAsyncDataPollable,
NonBlockingWait,
Cancel);
// batch tests // batch tests
template <typename T> template <typename T>
class AsyncBatchTest : public ::testing::Test {}; class AsyncBatchTest : public ::testing::Test {};
...@@ -524,7 +511,6 @@ TYPED_TEST_P(AsyncBatchTest, BatchRead) { ...@@ -524,7 +511,6 @@ TYPED_TEST_P(AsyncBatchTest, BatchRead) {
CHECK_EQ(completed, kBatchNumEntries); CHECK_EQ(completed, kBatchNumEntries);
} }
REGISTER_TYPED_TEST_CASE_P(AsyncBatchTest, BatchRead);
} // namespace async_base_test_lib_detail } // namespace async_base_test_lib_detail
} // namespace test } // namespace test
} // namespace folly } // namespace folly
...@@ -22,6 +22,22 @@ using folly::AsyncIO; ...@@ -22,6 +22,22 @@ using folly::AsyncIO;
namespace folly { namespace folly {
namespace test { namespace test {
namespace async_base_test_lib_detail { namespace async_base_test_lib_detail {
REGISTER_TYPED_TEST_CASE_P(
AsyncTest,
ZeroAsyncDataNotPollable,
ZeroAsyncDataPollable,
SingleAsyncDataNotPollable,
SingleAsyncDataPollable,
MultipleAsyncDataNotPollable,
MultipleAsyncDataPollable,
ManyAsyncDataNotPollable,
ManyAsyncDataPollable,
NonBlockingWait,
Cancel);
REGISTER_TYPED_TEST_CASE_P(AsyncBatchTest, BatchRead);
INSTANTIATE_TYPED_TEST_CASE_P(AsyncTest, AsyncTest, AsyncIO); INSTANTIATE_TYPED_TEST_CASE_P(AsyncTest, AsyncTest, AsyncIO);
class BatchAsyncIO : public AsyncIO { class BatchAsyncIO : public AsyncIO {
......
...@@ -23,6 +23,21 @@ using folly::IoUring; ...@@ -23,6 +23,21 @@ using folly::IoUring;
namespace folly { namespace folly {
namespace test { namespace test {
namespace async_base_test_lib_detail { namespace async_base_test_lib_detail {
REGISTER_TYPED_TEST_CASE_P(
AsyncTest,
ZeroAsyncDataNotPollable,
ZeroAsyncDataPollable,
SingleAsyncDataNotPollable,
SingleAsyncDataPollable,
MultipleAsyncDataNotPollable,
MultipleAsyncDataPollable,
ManyAsyncDataNotPollable,
ManyAsyncDataPollable,
NonBlockingWait,
Cancel);
REGISTER_TYPED_TEST_CASE_P(AsyncBatchTest, BatchRead);
INSTANTIATE_TYPED_TEST_CASE_P(AsyncTest, AsyncTest, IoUring); INSTANTIATE_TYPED_TEST_CASE_P(AsyncTest, AsyncTest, IoUring);
class BatchIoUring : public IoUring { class BatchIoUring : public IoUring {
......
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