Remove Windows workarounds in some tests.
leveldb::Env::DeleteFile was replaced with leveldb::Env::RemoveFile in all tests. This allows us to remove workarounds for windows.h #defining DeleteFile. PiperOrigin-RevId: 289121105
This commit is contained in:
parent
a0191e5563
commit
5903e7a112
@ -18,11 +18,6 @@
|
|||||||
#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
|
||||||
|
@ -23,11 +23,6 @@
|
|||||||
#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) {
|
||||||
|
@ -25,11 +25,6 @@
|
|||||||
#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;
|
||||||
|
@ -13,11 +13,6 @@
|
|||||||
#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 {
|
||||||
|
@ -13,11 +13,6 @@
|
|||||||
#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 {
|
||||||
|
@ -12,11 +12,6 @@
|
|||||||
#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;
|
||||||
|
Loading…
Reference in New Issue
Block a user