tqcq/leveldb
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Defend against inclusion of windows.h in tests that invoke

Browse Source 
Env::DeleteFile.

PiperOrigin-RevId: 283607548
This commit is contained in:
leveldb Team 2019-12-03 13:15:21 -08:00 committed by Victor Costan
parent 58a89bbcb2
commit d152b23f3b
6 changed files with 30 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
benchmarks/db_bench.cc
View File

@ -18,6 +18,11 @@
#include "util/random.h" #include "util/random.h"
#include "util/testutil.h" #include "util/testutil.h"
#if defined(_WIN32) && defined(DeleteFile)
// See rationale in env.h
#undef DeleteFile
#endif
// Comma-separated list of operations to run in the specified order // Comma-separated list of operations to run in the specified order
// Actual benchmarks: // Actual benchmarks:
// fillseq -- write N values in sequential key order in async mode // fillseq -- write N values in sequential key order in async mode

5
db/db_test.cc
View File

@ -23,6 +23,11 @@
#include "util/mutexlock.h" #include "util/mutexlock.h"
#include "util/testutil.h" #include "util/testutil.h"
#if defined(_WIN32) && defined(DeleteFile)
// See rationale in env.h
#undef DeleteFile
#endif
namespace leveldb { namespace leveldb {
static std::string RandomString(Random* rnd, int len) { static std::string RandomString(Random* rnd, int len) {

5
db/fault_injection_test.cc
View File

@ -25,6 +25,11 @@
#include "util/mutexlock.h" #include "util/mutexlock.h"
#include "util/testutil.h" #include "util/testutil.h"
#if defined(_WIN32) && defined(DeleteFile)
// See rationale in env.h
#undef DeleteFile
#endif
namespace leveldb { namespace leveldb {
static const int kValueSize = 1000; static const int kValueSize = 1000;

5
db/recovery_test.cc
View File

@ -13,6 +13,11 @@
#include "util/logging.h" #include "util/logging.h"
#include "util/testutil.h" #include "util/testutil.h"
#if defined(_WIN32) && defined(DeleteFile)
// See rationale in env.h
#undef DeleteFile
#endif
namespace leveldb { namespace leveldb {
class RecoveryTest : public testing::Test { class RecoveryTest : public testing::Test {

5
helpers/memenv/memenv_test.cc
View File

@ -13,6 +13,11 @@
#include "leveldb/env.h" #include "leveldb/env.h"
#include "util/testutil.h" #include "util/testutil.h"
#if defined(_WIN32) && defined(DeleteFile)
// See rationale in env.h
#undef DeleteFile
#endif
namespace leveldb { namespace leveldb {
class MemEnvTest : public testing::Test { class MemEnvTest : public testing::Test {

5
util/env_test.cc
View File

@ -12,6 +12,11 @@
#include "util/mutexlock.h" #include "util/mutexlock.h"
#include "util/testutil.h" #include "util/testutil.h"
#if defined(_WIN32) && defined(DeleteFile)
// See rationale in env.h
#undef DeleteFile
#endif
namespace leveldb { namespace leveldb {
static const int kDelayMicros = 100000; static const int kDelayMicros = 100000;