Browse Source

Defend against inclusion of windows.h in tests that invoke

Env::DeleteFile.

PiperOrigin-RevId: 283607548
main
leveldb Team 4 years ago
committed by Victor Costan
parent
commit
d152b23f3b
6 changed files with 30 additions and 0 deletions
  1. +5
    -0
      benchmarks/db_bench.cc
  2. +5
    -0
      db/db_test.cc
  3. +5
    -0
      db/fault_injection_test.cc
  4. +5
    -0
      db/recovery_test.cc
  5. +5
    -0
      helpers/memenv/memenv_test.cc
  6. +5
    -0
      util/env_test.cc

+ 5
- 0
benchmarks/db_bench.cc View File

@ -18,6 +18,11 @@
#include "util/random.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
// Actual benchmarks:
// fillseq -- write N values in sequential key order in async mode

+ 5
- 0
db/db_test.cc View File

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

+ 5
- 0
db/fault_injection_test.cc View File

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

+ 5
- 0
db/recovery_test.cc View File

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

+ 5
- 0
helpers/memenv/memenv_test.cc View File

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

+ 5
- 0
util/env_test.cc View File

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

Loading…
Cancel
Save