yuzu/breakpad
1
0
Fork 0
mirror of https://github.com/yuzu-emu/breakpad.git synced 2025-07-04 19:18:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

windows: update gtest/gmock paths

Browse source 
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 <mark@chromium.org>
This commit is contained in:
Mike Frysinger 2017-02-11 12:44:48 -05:00
parent 333ed18eb0
commit 12f8ca4855
6 changed files with 22 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/client/windows/unittests/crash_generation_server_test.cc
View file

@ -28,9 +28,7 @@
// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#include "testing/gtest/include/gtest/gtest.h" #include "breakpad_googletest_includes.h"
#include "testing/include/gmock/gmock.h"
#include "client/windows/crash_generation/crash_generation_server.h" #include "client/windows/crash_generation/crash_generation_server.h"
#include "client/windows/common/ipc_protocol.h" #include "client/windows/common/ipc_protocol.h"

2
src/client/windows/unittests/dump_analysis.cc
View file

@ -31,8 +31,8 @@
#include <objbase.h> #include <objbase.h>
#include <dbghelp.h> #include <dbghelp.h>
#include "breakpad_googletest_includes.h"
#include "client/windows/unittests/dump_analysis.h" // NOLINT #include "client/windows/unittests/dump_analysis.h" // NOLINT
#include "testing/gtest/include/gtest/gtest.h"
DumpAnalysis::~DumpAnalysis() { DumpAnalysis::~DumpAnalysis() {
if (dump_file_view_ != NULL) { if (dump_file_view_ != NULL) {

3
src/client/windows/unittests/minidump_test.cc
View file

@ -31,11 +31,10 @@
#include <objbase.h> #include <objbase.h>
#include <dbghelp.h> #include <dbghelp.h>
#include "breakpad_googletest_includes.h"
#include "client/windows/crash_generation/minidump_generator.h" #include "client/windows/crash_generation/minidump_generator.h"
#include "client/windows/unittests/dump_analysis.h" // NOLINT #include "client/windows/unittests/dump_analysis.h" // NOLINT
#include "gtest/gtest.h"
namespace { namespace {
// Minidump with stacks, PEB, TEB, and unloaded module list. // Minidump with stacks, PEB, TEB, and unloaded module list.

25
src/client/windows/unittests/testing.gyp
View file

@ -38,11 +38,12 @@
'type': 'static_library', 'type': 'static_library',
'include_dirs': [ 'include_dirs': [
'<(DEPTH)/testing/include', '<(DEPTH)/testing/include',
'<(DEPTH)/testing/gtest', '<(DEPTH)/testing/googletest/include',
'<(DEPTH)/testing/gtest/include', '<(DEPTH)/testing/googletest',
'<(DEPTH)/testing',
], ],
'sources': [ 'sources': [
'<(DEPTH)/testing/gtest/src/gtest-all.cc', '<(DEPTH)/testing/googletest/src/gtest-all.cc',
], ],
'direct_dependent_settings': { 'direct_dependent_settings': {
'include_dirs': [ 'include_dirs': [
@ -61,18 +62,24 @@
'type': 'static_library', 'type': 'static_library',
'include_dirs': [ 'include_dirs': [
'<(DEPTH)/testing/include', '<(DEPTH)/testing/include',
'<(DEPTH)/testing/', '<(DEPTH)/testing/googletest/include',
'<(DEPTH)/testing/gtest', '<(DEPTH)/testing/googletest',
'<(DEPTH)/testing/gtest/include', '<(DEPTH)/testing/googlemock/include',
'<(DEPTH)/testing/googlemock',
'<(DEPTH)/testing',
], ],
'sources': [ 'sources': [
'<(DEPTH)/testing/src/gmock-all.cc', '<(DEPTH)/testing/googlemock/src/gmock-all.cc',
'<(DEPTH)/testing/src/gmock_main.cc', '<(DEPTH)/testing/googletest/src/gtest_main.cc',
], ],
'direct_dependent_settings': { 'direct_dependent_settings': {
'include_dirs': [ 'include_dirs': [
'<(DEPTH)/testing/include', '<(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'], 'defines': ['_VARIADIC_MAX=10'],
}, },

3
src/common/windows/omap_unittest.cc
View file

@ -30,8 +30,7 @@
#include "common/windows/omap.h" #include "common/windows/omap.h"
#include "gmock/gmock.h" #include "breakpad_googletest_includes.h"
#include "gtest/gtest.h"
namespace google_breakpad { namespace google_breakpad {

3
src/tools/windows/dump_syms/dump_syms_unittest.cc
View file

@ -32,8 +32,7 @@
#include <string> #include <string>
#include <utility> #include <utility>
#include "gmock/gmock.h" #include "breakpad_googletest_includes.h"
#include "gtest/gtest.h"
namespace tools { namespace tools {
namespace windows { namespace windows {