diff options
author | costan <costan@google.com> | 2018-03-16 06:23:29 -0700 |
---|---|---|
committer | Victor Costan <pwnall@chromium.org> | 2018-03-16 10:31:48 -0700 |
commit | 8143c12f3fc483b1ba61cdce11f9c1faf6d01bea (patch) | |
tree | b3b1a2d2751e2e62f00ff5f48592c79d5d60fed8 | |
parent | aece2068d7375f987685b8b145288c5557f9ce50 (diff) | |
download | leveldb-8143c12f3fc483b1ba61cdce11f9c1faf6d01bea.tar.gz |
Fix includes in util/testharness.h.
This CL removes unused headers included by util/testharness.h, adds
precise includes where the build breaks, and fixes style errors in the
edited files.
-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=189331061
-rw-r--r-- | db/db_bench.cc | 3 | ||||
-rw-r--r-- | util/coding.h | 6 | ||||
-rw-r--r-- | util/coding_test.cc | 3 | ||||
-rw-r--r-- | util/testharness.cc | 6 | ||||
-rw-r--r-- | util/testharness.h | 40 |
5 files changed, 32 insertions, 26 deletions
diff --git a/db/db_bench.cc b/db/db_bench.cc index 3ad19a5..920f119 100644 --- a/db/db_bench.cc +++ b/db/db_bench.cc @@ -5,11 +5,10 @@ #include <sys/types.h> #include <stdio.h> #include <stdlib.h> -#include "db/db_impl.h" -#include "db/version_set.h" #include "leveldb/cache.h" #include "leveldb/db.h" #include "leveldb/env.h" +#include "leveldb/filter_policy.h" #include "leveldb/write_batch.h" #include "port/port.h" #include "util/crc32c.h" diff --git a/util/coding.h b/util/coding.h index 5c4d40e..1fb3d66 100644 --- a/util/coding.h +++ b/util/coding.h @@ -12,7 +12,9 @@ #include <stdint.h> #include <string.h> + #include <string> + #include "leveldb/slice.h" #include "port/port.h" @@ -35,8 +37,8 @@ bool GetLengthPrefixedSlice(Slice* input, Slice* result); // in *v and return a pointer just past the parsed value, or return // NULL on error. These routines only look at bytes in the range // [p..limit-1] -const char* GetVarint32Ptr(const char* p,const char* limit, uint32_t* v); -const char* GetVarint64Ptr(const char* p,const char* limit, uint64_t* v); +const char* GetVarint32Ptr(const char* p, const char* limit, uint32_t* v); +const char* GetVarint64Ptr(const char* p, const char* limit, uint64_t* v); // Returns the length of the varint32 or varint64 encoding of "v" int VarintLength(uint64_t v); diff --git a/util/coding_test.cc b/util/coding_test.cc index 521541e..22f6adc 100644 --- a/util/coding_test.cc +++ b/util/coding_test.cc @@ -2,8 +2,9 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. See the AUTHORS file for names of contributors. -#include "util/coding.h" +#include <vector> +#include "util/coding.h" #include "util/testharness.h" namespace leveldb { diff --git a/util/testharness.cc b/util/testharness.cc index 402fab3..95f025f 100644 --- a/util/testharness.cc +++ b/util/testharness.cc @@ -4,11 +4,15 @@ #include "util/testharness.h" -#include <string> #include <stdlib.h> #include <sys/stat.h> #include <sys/types.h> +#include <string> +#include <vector> + +#include "leveldb/env.h" + namespace leveldb { namespace test { diff --git a/util/testharness.h b/util/testharness.h index 029e5c7..8ee7972 100644 --- a/util/testharness.h +++ b/util/testharness.h @@ -7,10 +7,10 @@ #include <stdio.h> #include <stdlib.h> + #include <sstream> -#include "leveldb/env.h" -#include "leveldb/slice.h" -#include "util/random.h" + +#include "leveldb/status.h" namespace leveldb { namespace test { @@ -74,10 +74,10 @@ class Tester { return *this; } -#define BINARY_OP(name,op) \ +#define BINARY_OP(name, op) \ template <class X, class Y> \ Tester& name(const X& x, const Y& y) { \ - if (! (x op y)) { \ + if (!(x op y)) { \ ss_ << " failed: " << x << (" " #op " ") << y; \ ok_ = false; \ } \ @@ -111,21 +111,21 @@ class Tester { #define ASSERT_LE(a,b) ::leveldb::test::Tester(__FILE__, __LINE__).IsLe((a),(b)) #define ASSERT_LT(a,b) ::leveldb::test::Tester(__FILE__, __LINE__).IsLt((a),(b)) -#define TCONCAT(a,b) TCONCAT1(a,b) -#define TCONCAT1(a,b) a##b - -#define TEST(base,name) \ -class TCONCAT(_Test_,name) : public base { \ - public: \ - void _Run(); \ - static void _RunIt() { \ - TCONCAT(_Test_,name) t; \ - t._Run(); \ - } \ -}; \ -bool TCONCAT(_Test_ignored_,name) = \ - ::leveldb::test::RegisterTest(#base, #name, &TCONCAT(_Test_,name)::_RunIt); \ -void TCONCAT(_Test_,name)::_Run() +#define TCONCAT(a, b) TCONCAT1(a, b) +#define TCONCAT1(a, b) a##b + +#define TEST(base, name) \ +class TCONCAT(_Test_, name) : public base { \ + public: \ + void _Run(); \ + static void _RunIt() { \ + TCONCAT(_Test_, name) t; \ + t._Run(); \ + } \ +}; \ +bool TCONCAT(_Test_ignored_, name) = \ + ::leveldb::test::RegisterTest(#base, #name, &TCONCAT(_Test_, name)::_RunIt); \ +void TCONCAT(_Test_, name)::_Run() // Register the specified test. Typically not used directly, but // invoked via the macro expansion of TEST. |