summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVictor Costan <pwnall@chromium.org>2019-11-30 01:18:19 -0800
committerVictor Costan <pwnall@chromium.org>2019-11-30 02:03:45 -0800
commitb91ff7fbc8941bd271365df0f2f9199d96a0fffb (patch)
treefe8d4ec495efc31881e8051a7eb5925fe7779c0a
parentdb8352187b2c2d037b6fe215b7f82415789ec71f (diff)
downloadleveldb-gtest_pathx.tar.gz
Use relative paths for googletest includes.gtest_pathx
This gives more flexibility in choosing where googletest is checked out or installed, and makes it easier to embed this library in larger projects.
-rw-r--r--db/autocompact_test.cc2
-rw-r--r--db/corruption_test.cc2
-rw-r--r--db/db_test.cc2
-rw-r--r--db/dbformat_test.cc2
-rw-r--r--db/fault_injection_test.cc2
-rw-r--r--db/filename_test.cc2
-rw-r--r--db/log_test.cc2
-rw-r--r--db/recovery_test.cc2
-rw-r--r--db/skiplist_test.cc2
-rw-r--r--db/version_edit_test.cc2
-rw-r--r--db/version_set_test.cc2
-rw-r--r--db/write_batch_test.cc2
-rw-r--r--helpers/memenv/memenv_test.cc2
-rw-r--r--issues/issue178_test.cc2
-rw-r--r--issues/issue200_test.cc2
-rw-r--r--issues/issue320_test.cc2
-rw-r--r--table/filter_block_test.cc2
-rw-r--r--table/table_test.cc2
-rw-r--r--util/arena_test.cc2
-rw-r--r--util/bloom_test.cc2
-rw-r--r--util/cache_test.cc2
-rw-r--r--util/coding_test.cc2
-rw-r--r--util/crc32c_test.cc2
-rw-r--r--util/env_posix_test.cc2
-rw-r--r--util/env_test.cc2
-rw-r--r--util/env_windows_test.cc2
-rw-r--r--util/hash_test.cc2
-rw-r--r--util/logging_test.cc2
-rw-r--r--util/no_destructor_test.cc2
-rw-r--r--util/status_test.cc2
-rw-r--r--util/testutil.h4
31 files changed, 32 insertions, 32 deletions
diff --git a/db/autocompact_test.cc b/db/autocompact_test.cc
index d4caf71..9779c95 100644
--- a/db/autocompact_test.cc
+++ b/db/autocompact_test.cc
@@ -2,7 +2,7 @@
// 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 "third_party/googletest/googletest/include/gtest/gtest.h"
+#include "gtest/gtest.h"
#include "db/db_impl.h"
#include "leveldb/cache.h"
#include "leveldb/db.h"
diff --git a/db/corruption_test.cc b/db/corruption_test.cc
index 4d20946..b22f9e7 100644
--- a/db/corruption_test.cc
+++ b/db/corruption_test.cc
@@ -4,7 +4,7 @@
#include <sys/types.h>
-#include "third_party/googletest/googletest/include/gtest/gtest.h"
+#include "gtest/gtest.h"
#include "db/db_impl.h"
#include "db/filename.h"
#include "db/log_format.h"
diff --git a/db/db_test.cc b/db/db_test.cc
index e8e3495..1bd5afc 100644
--- a/db/db_test.cc
+++ b/db/db_test.cc
@@ -7,7 +7,7 @@
#include <atomic>
#include <string>
-#include "third_party/googletest/googletest/include/gtest/gtest.h"
+#include "gtest/gtest.h"
#include "db/db_impl.h"
#include "db/filename.h"
#include "db/version_set.h"
diff --git a/db/dbformat_test.cc b/db/dbformat_test.cc
index ca49e0a..4a11c4a 100644
--- a/db/dbformat_test.cc
+++ b/db/dbformat_test.cc
@@ -4,7 +4,7 @@
#include "db/dbformat.h"
-#include "third_party/googletest/googletest/include/gtest/gtest.h"
+#include "gtest/gtest.h"
#include "util/logging.h"
namespace leveldb {
diff --git a/db/fault_injection_test.cc b/db/fault_injection_test.cc
index 80b8f12..db8580c 100644
--- a/db/fault_injection_test.cc
+++ b/db/fault_injection_test.cc
@@ -9,7 +9,7 @@
#include <map>
#include <set>
-#include "third_party/googletest/googletest/include/gtest/gtest.h"
+#include "gtest/gtest.h"
#include "db/db_impl.h"
#include "db/filename.h"
#include "db/log_format.h"
diff --git a/db/filename_test.cc b/db/filename_test.cc
index ad0bc73..f291d72 100644
--- a/db/filename_test.cc
+++ b/db/filename_test.cc
@@ -4,7 +4,7 @@
#include "db/filename.h"
-#include "third_party/googletest/googletest/include/gtest/gtest.h"
+#include "gtest/gtest.h"
#include "db/dbformat.h"
#include "port/port.h"
#include "util/logging.h"
diff --git a/db/log_test.cc b/db/log_test.cc
index 680f267..c765e93 100644
--- a/db/log_test.cc
+++ b/db/log_test.cc
@@ -2,7 +2,7 @@
// 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 "third_party/googletest/googletest/include/gtest/gtest.h"
+#include "gtest/gtest.h"
#include "db/log_reader.h"
#include "db/log_writer.h"
#include "leveldb/env.h"
diff --git a/db/recovery_test.cc b/db/recovery_test.cc
index 0657743..cf6574e 100644
--- a/db/recovery_test.cc
+++ b/db/recovery_test.cc
@@ -2,7 +2,7 @@
// 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 "third_party/googletest/googletest/include/gtest/gtest.h"
+#include "gtest/gtest.h"
#include "db/db_impl.h"
#include "db/filename.h"
#include "db/version_set.h"
diff --git a/db/skiplist_test.cc b/db/skiplist_test.cc
index 04b9fa7..7c5d09b 100644
--- a/db/skiplist_test.cc
+++ b/db/skiplist_test.cc
@@ -7,7 +7,7 @@
#include <atomic>
#include <set>
-#include "third_party/googletest/googletest/include/gtest/gtest.h"
+#include "gtest/gtest.h"
#include "leveldb/env.h"
#include "port/port.h"
#include "port/thread_annotations.h"
diff --git a/db/version_edit_test.cc b/db/version_edit_test.cc
index 228fa3b..39ea8b7 100644
--- a/db/version_edit_test.cc
+++ b/db/version_edit_test.cc
@@ -4,7 +4,7 @@
#include "db/version_edit.h"
-#include "third_party/googletest/googletest/include/gtest/gtest.h"
+#include "gtest/gtest.h"
namespace leveldb {
diff --git a/db/version_set_test.cc b/db/version_set_test.cc
index 71b19a7..dee6b4c 100644
--- a/db/version_set_test.cc
+++ b/db/version_set_test.cc
@@ -4,7 +4,7 @@
#include "db/version_set.h"
-#include "third_party/googletest/googletest/include/gtest/gtest.h"
+#include "gtest/gtest.h"
#include "util/logging.h"
#include "util/testutil.h"
diff --git a/db/write_batch_test.cc b/db/write_batch_test.cc
index b33993a..64df9b8 100644
--- a/db/write_batch_test.cc
+++ b/db/write_batch_test.cc
@@ -2,7 +2,7 @@
// 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 "third_party/googletest/googletest/include/gtest/gtest.h"
+#include "gtest/gtest.h"
#include "db/memtable.h"
#include "db/write_batch_internal.h"
#include "leveldb/db.h"
diff --git a/helpers/memenv/memenv_test.cc b/helpers/memenv/memenv_test.cc
index 72e22da..2001101 100644
--- a/helpers/memenv/memenv_test.cc
+++ b/helpers/memenv/memenv_test.cc
@@ -7,7 +7,7 @@
#include <string>
#include <vector>
-#include "third_party/googletest/googletest/include/gtest/gtest.h"
+#include "gtest/gtest.h"
#include "db/db_impl.h"
#include "leveldb/db.h"
#include "leveldb/env.h"
diff --git a/issues/issue178_test.cc b/issues/issue178_test.cc
index 4a52a1b..7fc43ea 100644
--- a/issues/issue178_test.cc
+++ b/issues/issue178_test.cc
@@ -7,7 +7,7 @@
#include <iostream>
#include <sstream>
-#include "third_party/googletest/googletest/include/gtest/gtest.h"
+#include "gtest/gtest.h"
#include "leveldb/db.h"
#include "leveldb/write_batch.h"
#include "util/testutil.h"
diff --git a/issues/issue200_test.cc b/issues/issue200_test.cc
index ee08bc6..4eba23a 100644
--- a/issues/issue200_test.cc
+++ b/issues/issue200_test.cc
@@ -6,7 +6,7 @@
// to forward, the current key can be yielded unexpectedly if a new
// mutation has been added just before the current key.
-#include "third_party/googletest/googletest/include/gtest/gtest.h"
+#include "gtest/gtest.h"
#include "leveldb/db.h"
#include "util/testutil.h"
diff --git a/issues/issue320_test.cc b/issues/issue320_test.cc
index c289ab4..c08296a 100644
--- a/issues/issue320_test.cc
+++ b/issues/issue320_test.cc
@@ -9,7 +9,7 @@
#include <string>
#include <vector>
-#include "third_party/googletest/googletest/include/gtest/gtest.h"
+#include "gtest/gtest.h"
#include "leveldb/db.h"
#include "leveldb/write_batch.h"
#include "util/testutil.h"
diff --git a/table/filter_block_test.cc b/table/filter_block_test.cc
index 53be948..91a6be2 100644
--- a/table/filter_block_test.cc
+++ b/table/filter_block_test.cc
@@ -4,7 +4,7 @@
#include "table/filter_block.h"
-#include "third_party/googletest/googletest/include/gtest/gtest.h"
+#include "gtest/gtest.h"
#include "leveldb/filter_policy.h"
#include "util/coding.h"
#include "util/hash.h"
diff --git a/table/table_test.cc b/table/table_test.cc
index 09d1b5d..713b63e 100644
--- a/table/table_test.cc
+++ b/table/table_test.cc
@@ -7,7 +7,7 @@
#include <map>
#include <string>
-#include "third_party/googletest/googletest/include/gtest/gtest.h"
+#include "gtest/gtest.h"
#include "db/dbformat.h"
#include "db/memtable.h"
#include "db/write_batch_internal.h"
diff --git a/util/arena_test.cc b/util/arena_test.cc
index 3f8855b..90226fe 100644
--- a/util/arena_test.cc
+++ b/util/arena_test.cc
@@ -4,7 +4,7 @@
#include "util/arena.h"
-#include "third_party/googletest/googletest/include/gtest/gtest.h"
+#include "gtest/gtest.h"
#include "util/random.h"
namespace leveldb {
diff --git a/util/bloom_test.cc b/util/bloom_test.cc
index bcbd7f6..bcf14dc 100644
--- a/util/bloom_test.cc
+++ b/util/bloom_test.cc
@@ -2,7 +2,7 @@
// 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 "third_party/googletest/googletest/include/gtest/gtest.h"
+#include "gtest/gtest.h"
#include "leveldb/filter_policy.h"
#include "util/coding.h"
#include "util/logging.h"
diff --git a/util/cache_test.cc b/util/cache_test.cc
index 8ce9463..b5d9873 100644
--- a/util/cache_test.cc
+++ b/util/cache_test.cc
@@ -6,7 +6,7 @@
#include <vector>
-#include "third_party/googletest/googletest/include/gtest/gtest.h"
+#include "gtest/gtest.h"
#include "util/coding.h"
namespace leveldb {
diff --git a/util/coding_test.cc b/util/coding_test.cc
index db83367..aa6c748 100644
--- a/util/coding_test.cc
+++ b/util/coding_test.cc
@@ -6,7 +6,7 @@
#include <vector>
-#include "third_party/googletest/googletest/include/gtest/gtest.h"
+#include "gtest/gtest.h"
namespace leveldb {
diff --git a/util/crc32c_test.cc b/util/crc32c_test.cc
index 1e2aae7..647e561 100644
--- a/util/crc32c_test.cc
+++ b/util/crc32c_test.cc
@@ -4,7 +4,7 @@
#include "util/crc32c.h"
-#include "third_party/googletest/googletest/include/gtest/gtest.h"
+#include "gtest/gtest.h"
namespace leveldb {
namespace crc32c {
diff --git a/util/env_posix_test.cc b/util/env_posix_test.cc
index 5ee2248..ed4ac96 100644
--- a/util/env_posix_test.cc
+++ b/util/env_posix_test.cc
@@ -13,7 +13,7 @@
#include <unordered_set>
#include <vector>
-#include "third_party/googletest/googletest/include/gtest/gtest.h"
+#include "gtest/gtest.h"
#include "leveldb/env.h"
#include "port/port.h"
#include "util/env_posix_test_helper.h"
diff --git a/util/env_test.cc b/util/env_test.cc
index 2a1f73b..b35ba05 100644
--- a/util/env_test.cc
+++ b/util/env_test.cc
@@ -6,7 +6,7 @@
#include <algorithm>
-#include "third_party/googletest/googletest/include/gtest/gtest.h"
+#include "gtest/gtest.h"
#include "port/port.h"
#include "port/thread_annotations.h"
#include "util/mutexlock.h"
diff --git a/util/env_windows_test.cc b/util/env_windows_test.cc
index b926107..c75ca7b 100644
--- a/util/env_windows_test.cc
+++ b/util/env_windows_test.cc
@@ -2,7 +2,7 @@
// 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 "third_party/googletest/googletest/include/gtest/gtest.h"
+#include "gtest/gtest.h"
#include "leveldb/env.h"
#include "port/port.h"
#include "util/env_windows_test_helper.h"
diff --git a/util/hash_test.cc b/util/hash_test.cc
index e970c1e..6d6771f 100644
--- a/util/hash_test.cc
+++ b/util/hash_test.cc
@@ -4,7 +4,7 @@
#include "util/hash.h"
-#include "third_party/googletest/googletest/include/gtest/gtest.h"
+#include "gtest/gtest.h"
namespace leveldb {
diff --git a/util/logging_test.cc b/util/logging_test.cc
index 92417aa..24e1fe9 100644
--- a/util/logging_test.cc
+++ b/util/logging_test.cc
@@ -7,7 +7,7 @@
#include <limits>
#include <string>
-#include "third_party/googletest/googletest/include/gtest/gtest.h"
+#include "gtest/gtest.h"
#include "leveldb/slice.h"
namespace leveldb {
diff --git a/util/no_destructor_test.cc b/util/no_destructor_test.cc
index edafb08..68fdfee 100644
--- a/util/no_destructor_test.cc
+++ b/util/no_destructor_test.cc
@@ -8,7 +8,7 @@
#include <cstdlib>
#include <utility>
-#include "third_party/googletest/googletest/include/gtest/gtest.h"
+#include "gtest/gtest.h"
namespace leveldb {
diff --git a/util/status_test.cc b/util/status_test.cc
index b7e2444..914b386 100644
--- a/util/status_test.cc
+++ b/util/status_test.cc
@@ -6,7 +6,7 @@
#include <utility>
-#include "third_party/googletest/googletest/include/gtest/gtest.h"
+#include "gtest/gtest.h"
#include "leveldb/slice.h"
namespace leveldb {
diff --git a/util/testutil.h b/util/testutil.h
index 5765afb..cc67d96 100644
--- a/util/testutil.h
+++ b/util/testutil.h
@@ -5,8 +5,8 @@
#ifndef STORAGE_LEVELDB_UTIL_TESTUTIL_H_
#define STORAGE_LEVELDB_UTIL_TESTUTIL_H_
-#include "third_party/googletest/googlemock/include/gmock/gmock.h"
-#include "third_party/googletest/googletest/include/gtest/gtest.h"
+#include "gmock/gmock.h"
+#include "gtest/gtest.h"
#include "helpers/memenv/memenv.h"
#include "leveldb/env.h"
#include "leveldb/slice.h"