Commit 06bcde59 by Geoff Lang

Remove gmock the dependency from angle_tests and compiler_tests.

BUG=angle:611 Change-Id: Ieb250bda25d62cda3e0690d05d814a4a39062d92 Reviewed-on: https://chromium-review.googlesource.com/197042Reviewed-by: 's avatarJamie Madill <jmadill@chromium.org> Reviewed-by: 's avatarShannon Woods <shannonwoods@chromium.org> Tested-by: 's avatarGeoff Lang <geofflang@chromium.org>
parent bde4c2f7
...@@ -4,13 +4,12 @@ ...@@ -4,13 +4,12 @@
// found in the LICENSE file. // found in the LICENSE file.
// //
#include "gmock/gmock.h"
#include "gtest/gtest.h" #include "gtest/gtest.h"
#include "ANGLETest.h" #include "ANGLETest.h"
int main(int argc, char** argv) int main(int argc, char** argv)
{ {
testing::InitGoogleMock(&argc, argv); testing::InitGoogleTest(&argc, argv);
testing::AddGlobalTestEnvironment(new ANGLETestEnvironment()); testing::AddGlobalTestEnvironment(new ANGLETestEnvironment());
int rt = RUN_ALL_TESTS(); int rt = RUN_ALL_TESTS();
return rt; return rt;
......
...@@ -4,7 +4,6 @@ ...@@ -4,7 +4,6 @@
// found in the LICENSE file. // found in the LICENSE file.
// //
#include "gmock/gmock.h"
#include "gtest/gtest.h" #include "gtest/gtest.h"
#include "GLSLANG/ShaderLang.h" #include "GLSLANG/ShaderLang.h"
...@@ -30,7 +29,7 @@ class CompilerTestEnvironment : public testing::Environment ...@@ -30,7 +29,7 @@ class CompilerTestEnvironment : public testing::Environment
int main(int argc, char** argv) int main(int argc, char** argv)
{ {
testing::InitGoogleMock(&argc, argv); testing::InitGoogleTest(&argc, argv);
testing::AddGlobalTestEnvironment(new CompilerTestEnvironment()); testing::AddGlobalTestEnvironment(new CompilerTestEnvironment());
int rt = RUN_ALL_TESTS(); int rt = RUN_ALL_TESTS();
return rt; return rt;
......
...@@ -91,14 +91,12 @@ ...@@ -91,14 +91,12 @@
[ [
'../src/angle.gyp:translator_static', '../src/angle.gyp:translator_static',
'gtest', 'gtest',
'gmock',
], ],
'include_dirs': 'include_dirs':
[ [
'../include', '../include',
'../src', '../src',
'third_party/googletest/include', 'third_party/googletest/include',
'third_party/googlemock/include',
], ],
'includes': 'includes':
[ [
...@@ -127,14 +125,12 @@ ...@@ -127,14 +125,12 @@
'../src/angle.gyp:libGLESv2', '../src/angle.gyp:libGLESv2',
'../src/angle.gyp:libEGL', '../src/angle.gyp:libEGL',
'gtest', 'gtest',
'gmock',
], ],
'include_dirs': 'include_dirs':
[ [
'../include', '../include',
'angle_tests', 'angle_tests',
'third_party/googletest/include', 'third_party/googletest/include',
'third_party/googlemock/include',
], ],
'sources': 'sources':
[ [
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment