Update and move gmock and gtest.

Update to the version of googletest current in chromium. Googlemock has merged into googletest so we get rid of the separate DEPs entry and point everything inside googletest. We put it in 'third_party' instead of 'testing' to prepare for the upcoming stand-alone gn build which borrows chromium build files that require other stuff in the 'testing' directory. BUG=angleproject:1569 Change-Id: I51d1675efd5d0104bb6390721928010221a5d6fc Reviewed-on: https://chromium-review.googlesource.com/713466Reviewed-by: Jamie Madill <jmadill@chromium.org> Reviewed-by: Corentin Wallez <cwallez@chromium.org> Commit-Queue: Frank Henigman <fjhenigman@chromium.org>

Update and move gmock and gtest.
6b076a09 · Frank Henigman · Commit Bot · 852fe873 · 6b076a09 · 6b076a09
Commit 6b076a09 authored Oct 11, 2017 by Frank Henigman Committed by Commit Bot Oct 11, 2017
Hide whitespace changes
Inline Side-by-side

Showing with 23 additions and 20 deletions

.gitignore .gitignore +1 -2

DEPS DEPS +3 -6

tests.gyp src/tests/tests.gyp +12 -12

README.angle third_party/googletest/README.angle +7 -0

No files found.
--- a/.gitignore
+++ b/.gitignore
@@ -21,11 +21,10 @@
 .gclient
 .gclient_entries
 /src/tests/third_party/gles_conformance_tests
-/testing/gmock
-/testing/gtest
 /third_party/cherry
 /third_party/deqp/src
 /third_party/glslang-angle/src
+/third_party/googletest/src
 /third_party/gyp
 /third_party/libpng
 /third_party/spirv-headers/src

--- a/DEPS
+++ b/DEPS
@@ -8,12 +8,6 @@ deps = {
  'buildtools':
    Var('chromium_git') + '/chromium/buildtools.git' + '@' + '98f00fa10dbad2cdbb2e297a66c3d6d5bc3994f3',

-  'testing/gmock':
-    Var('chromium_git') + '/external/googlemock.git' + '@' + '0421b6f358139f02e102c9c332ce19a33faf75be', # from svn revision 566
-
-  'testing/gtest':
-    Var('chromium_git') + '/external/github.com/google/googletest.git' + '@' + '6f8a66431cb592dad629028a50b3dd418a408c87',
-
  # Cherry is a dEQP management GUI written in Go. We use it for viewing test results.
  'third_party/cherry':
    Var('android_git') + '/platform/external/cherry' + '@' + 'd2e26b4d864ec2a6757e7f1174e464949ca5bf73',
@@ -24,6 +18,9 @@ deps = {
  'third_party/glslang-angle/src':
    Var('android_git') + '/platform/external/shaderc/glslang' + '@' + '1e275c8486325aaab34734ad9a650c0121c5efdb',

+  'third_party/googletest/src':
+    Var('chromium_git') + '/external/github.com/google/googletest.git' + '@' + '7f8fefabedf2965980585be8c2bff97458f28e0b',
+
  'third_party/gyp':
    Var('chromium_git') + '/external/gyp' + '@' + 'c6f471687407bf28ddfc63f1a8f47aeb7bf54edc',


--- a/src/tests/tests.gyp
+++ b/src/tests/tests.gyp
@@ -71,12 +71,12 @@
                    'includes': [ '../../gyp/common_defines.gypi', ],
                    'include_dirs':
                    [
-                        '<(angle_path)/testing/gtest',
-                        '<(angle_path)/testing/gtest/include',
+                        '<(angle_path)/third_party/googletest/src/googletest',
+                        '<(angle_path)/third_party/googletest/src/googletest/include',
                    ],
                    'sources':
                    [
-                        '<(angle_path)/testing/gtest/src/gtest-all.cc',
+                        '<(angle_path)/third_party/googletest/src/googletest/src/gtest-all.cc',
                    ],
                    'defines':
                    [
@@ -90,8 +90,8 @@
                        ],
                        'include_dirs':
                        [
-                            '<(angle_path)/testing/gtest',
-                            '<(angle_path)/testing/gtest/include',
+                            '<(angle_path)/third_party/googletest/src/googletest',
+                            '<(angle_path)/third_party/googletest/src/googletest/include',
                        ],
                    },
                },
@@ -102,13 +102,13 @@
                    'includes': [ '../../gyp/common_defines.gypi', ],
                    'include_dirs':
                    [
-                        '<(angle_path)/testing/gmock',
-                        '<(angle_path)/testing/gmock/include',
-                        '<(angle_path)/testing/gtest/include',
+                        '<(angle_path)/third_party/googletest/src/googlemock',
+                        '<(angle_path)/third_party/googletest/src/googlemock/include',
+                        '<(angle_path)/third_party/googletest/src/googletest/include',
                    ],
                    'sources':
                    [
-                        '<(angle_path)/testing/gmock/src/gmock-all.cc',
+                        '<(angle_path)/third_party/googletest/src/googlemock/src/gmock-all.cc',
                    ],
                    'defines':
                    [
@@ -122,9 +122,9 @@
                        ],
                        'include_dirs':
                        [
-                            '<(angle_path)/testing/gmock',
-                            '<(angle_path)/testing/gmock/include',
-                            '<(angle_path)/testing/gtest/include',
+                            '<(angle_path)/third_party/googletest/src/googlemock',
+                            '<(angle_path)/third_party/googletest/src/googlemock/include',
+                            '<(angle_path)/third_party/googletest/src/googletest/include',
                        ],
                    },
                },

--- a/third_party/googletest/README.angle
+++ b/third_party/googletest/README.angle
+Name: Google Test: Google's C++ Testing Framework
+Short Name: googletest
+URL: https://github.com/google/googletest.git
+Version: 1.8.0.git-7f8fefabedf2965980585be8c2bff97458f28e0b
+License: BSD
+License File: NOT_SHIPPED
+Security critical: no