andreacavalli/rocksdb
0
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

avoid ASSERT_EQ(false, ...);

Browse Source 
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
This commit is contained in:
Andrew Kryczka 2017-03-08 22:16:45 -08:00 committed by Facebook Github Bot
parent 5b11124e39
commit f2817fb7f9
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
db/db_test.cc
View File

@ -5208,7 +5208,7 @@ TEST_F(DBTest, PauseBackgroundWorkTest) {
}); });
env_->SleepForMicroseconds(200000); env_->SleepForMicroseconds(200000);
// make sure the thread is not done // make sure the thread is not done
ASSERT_EQ(false, done.load()); ASSERT_FALSE(done.load());
db_->ContinueBackgroundWork(); db_->ContinueBackgroundWork();
for (auto& t : threads) { for (auto& t : threads) {
t.join(); t.join();

4
table/table_test.cc
View File

@ -1187,9 +1187,9 @@ TEST_F(BlockBasedTableTest, RangeDelBlock) {
// iterator can still access its metablock's range tombstones. // iterator can still access its metablock's range tombstones.
c.ResetTableReader(); c.ResetTableReader();
} }
ASSERT_EQ(false, iter->Valid()); ASSERT_FALSE(iter->Valid());
iter->SeekToFirst(); iter->SeekToFirst();
ASSERT_EQ(true, iter->Valid()); ASSERT_TRUE(iter->Valid());
for (int i = 0; i < 2; i++) { for (int i = 0; i < 2; i++) {
ASSERT_TRUE(iter->Valid()); ASSERT_TRUE(iter->Valid());
ParsedInternalKey parsed_key; ParsedInternalKey parsed_key;