From f2817fb7f902e6a09add766113109ed9a5a20709 Mon Sep 17 00:00:00 2001 From: Andrew Kryczka Date: Wed, 8 Mar 2017 22:16:45 -0800 Subject: [PATCH] avoid ASSERT_EQ(false, ...); Summary: lately it fails on travis due to a compiler bug (see https://github.com/google/googletest/issues/322#issuecomment-125645145). interestingly it seems to affect occurrences of `ASSERT_EQ(false, ...);` but not `ASSERT_EQ(true, ...);`. Closes https://github.com/facebook/rocksdb/pull/1958 Differential Revision: D4680742 Pulled By: ajkr fbshipit-source-id: 291fe41 --- db/db_test.cc | 2 +- table/table_test.cc | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/db/db_test.cc b/db/db_test.cc index 36f57a627..0083b37b8 100644 --- a/db/db_test.cc +++ b/db/db_test.cc @@ -5208,7 +5208,7 @@ TEST_F(DBTest, PauseBackgroundWorkTest) { }); env_->SleepForMicroseconds(200000); // make sure the thread is not done - ASSERT_EQ(false, done.load()); + ASSERT_FALSE(done.load()); db_->ContinueBackgroundWork(); for (auto& t : threads) { t.join(); diff --git a/table/table_test.cc b/table/table_test.cc index 28e6741e4..4c2fe43ad 100644 --- a/table/table_test.cc +++ b/table/table_test.cc @@ -1187,9 +1187,9 @@ TEST_F(BlockBasedTableTest, RangeDelBlock) { // iterator can still access its metablock's range tombstones. c.ResetTableReader(); } - ASSERT_EQ(false, iter->Valid()); + ASSERT_FALSE(iter->Valid()); iter->SeekToFirst(); - ASSERT_EQ(true, iter->Valid()); + ASSERT_TRUE(iter->Valid()); for (int i = 0; i < 2; i++) { ASSERT_TRUE(iter->Valid()); ParsedInternalKey parsed_key;