Internal change.

PiperOrigin-RevId: 282373286
google · Dec 2, 2019 · 583a42b · 583a42b
1 parent db83521
commit 583a42b
Show file tree

Hide file tree

Showing 32 changed files with 32 additions and 33 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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/third_party/googletest b/third_party/googletest
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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"