From 12f8ca485582f8eba10a9126c99003a42db97db8 Mon Sep 17 00:00:00 2001 From: Mike Frysinger Date: Sat, 11 Feb 2017 12:44:48 -0500 Subject: windows: update gtest/gmock paths The Windows build has rotted a bit with the gtest/gmock updates. Update all of the paths to fix things up again. Change-Id: Id67ce76abfd331c0543aa4bd1138e9cc13a18c75 Reviewed-on: https://chromium-review.googlesource.com/441584 Reviewed-by: Mark Mentovai --- .../unittests/crash_generation_server_test.cc | 4 +--- src/client/windows/unittests/dump_analysis.cc | 2 +- src/client/windows/unittests/minidump_test.cc | 3 +-- src/client/windows/unittests/testing.gyp | 25 ++++++++++++++-------- src/common/windows/omap_unittest.cc | 3 +-- src/tools/windows/dump_syms/dump_syms_unittest.cc | 5 ++--- 6 files changed, 22 insertions(+), 20 deletions(-) (limited to 'src') diff --git a/src/client/windows/unittests/crash_generation_server_test.cc b/src/client/windows/unittests/crash_generation_server_test.cc index b7b2b84f..09f2dd20 100644 --- a/src/client/windows/unittests/crash_generation_server_test.cc +++ b/src/client/windows/unittests/crash_generation_server_test.cc @@ -28,9 +28,7 @@ // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -#include "testing/gtest/include/gtest/gtest.h" -#include "testing/include/gmock/gmock.h" - +#include "breakpad_googletest_includes.h" #include "client/windows/crash_generation/crash_generation_server.h" #include "client/windows/common/ipc_protocol.h" diff --git a/src/client/windows/unittests/dump_analysis.cc b/src/client/windows/unittests/dump_analysis.cc index 6bf85471..53d4ddbd 100644 --- a/src/client/windows/unittests/dump_analysis.cc +++ b/src/client/windows/unittests/dump_analysis.cc @@ -31,8 +31,8 @@ #include #include +#include "breakpad_googletest_includes.h" #include "client/windows/unittests/dump_analysis.h" // NOLINT -#include "testing/gtest/include/gtest/gtest.h" DumpAnalysis::~DumpAnalysis() { if (dump_file_view_ != NULL) { diff --git a/src/client/windows/unittests/minidump_test.cc b/src/client/windows/unittests/minidump_test.cc index 8d2d726c..d11fccab 100644 --- a/src/client/windows/unittests/minidump_test.cc +++ b/src/client/windows/unittests/minidump_test.cc @@ -31,11 +31,10 @@ #include #include +#include "breakpad_googletest_includes.h" #include "client/windows/crash_generation/minidump_generator.h" #include "client/windows/unittests/dump_analysis.h" // NOLINT -#include "gtest/gtest.h" - namespace { // Minidump with stacks, PEB, TEB, and unloaded module list. diff --git a/src/client/windows/unittests/testing.gyp b/src/client/windows/unittests/testing.gyp index 141d0ed0..cd8aca22 100644 --- a/src/client/windows/unittests/testing.gyp +++ b/src/client/windows/unittests/testing.gyp @@ -38,11 +38,12 @@ 'type': 'static_library', 'include_dirs': [ '<(DEPTH)/testing/include', - '<(DEPTH)/testing/gtest', - '<(DEPTH)/testing/gtest/include', + '<(DEPTH)/testing/googletest/include', + '<(DEPTH)/testing/googletest', + '<(DEPTH)/testing', ], 'sources': [ - '<(DEPTH)/testing/gtest/src/gtest-all.cc', + '<(DEPTH)/testing/googletest/src/gtest-all.cc', ], 'direct_dependent_settings': { 'include_dirs': [ @@ -61,18 +62,24 @@ 'type': 'static_library', 'include_dirs': [ '<(DEPTH)/testing/include', - '<(DEPTH)/testing/', - '<(DEPTH)/testing/gtest', - '<(DEPTH)/testing/gtest/include', + '<(DEPTH)/testing/googletest/include', + '<(DEPTH)/testing/googletest', + '<(DEPTH)/testing/googlemock/include', + '<(DEPTH)/testing/googlemock', + '<(DEPTH)/testing', ], 'sources': [ - '<(DEPTH)/testing/src/gmock-all.cc', - '<(DEPTH)/testing/src/gmock_main.cc', + '<(DEPTH)/testing/googlemock/src/gmock-all.cc', + '<(DEPTH)/testing/googletest/src/gtest_main.cc', ], 'direct_dependent_settings': { 'include_dirs': [ '<(DEPTH)/testing/include', - '<(DEPTH)/testing/gtest/include', + '<(DEPTH)/testing/googletest/include', + '<(DEPTH)/testing/googletest', + '<(DEPTH)/testing/googlemock/include', + '<(DEPTH)/testing/googlemock', + '<(DEPTH)/testing', ], 'defines': ['_VARIADIC_MAX=10'], }, diff --git a/src/common/windows/omap_unittest.cc b/src/common/windows/omap_unittest.cc index 960a33f4..7fe66bd4 100644 --- a/src/common/windows/omap_unittest.cc +++ b/src/common/windows/omap_unittest.cc @@ -30,8 +30,7 @@ #include "common/windows/omap.h" -#include "gmock/gmock.h" -#include "gtest/gtest.h" +#include "breakpad_googletest_includes.h" namespace google_breakpad { diff --git a/src/tools/windows/dump_syms/dump_syms_unittest.cc b/src/tools/windows/dump_syms/dump_syms_unittest.cc index 61f84431..1ae74a65 100644 --- a/src/tools/windows/dump_syms/dump_syms_unittest.cc +++ b/src/tools/windows/dump_syms/dump_syms_unittest.cc @@ -32,8 +32,7 @@ #include #include -#include "gmock/gmock.h" -#include "gtest/gtest.h" +#include "breakpad_googletest_includes.h" namespace tools { namespace windows { @@ -201,4 +200,4 @@ TEST_F(DumpSymsRegressionTest, EnsureDumpedSymbolsMatch) { } // namespace dump_syms } // namespace windows -} // namespace tools \ No newline at end of file +} // namespace tools -- cgit v1.2.1