aboutsummaryrefslogtreecommitdiff
path: root/testing
diff options
context:
space:
mode:
authorRubin Xu <rubinxu@google.com>2021-02-10 00:04:48 +0000
committerRubin Xu <rubinxu@google.com>2021-02-18 16:15:29 +0000
commit7314a9fc107bf9db96327cccfaa9b890e529b018 (patch)
tree086f3e6a7993bb346e943ed1aec7ad134fbc8f43 /testing
parent0c21ca9a7bd91fd88eabecfa9b6a528b51330149 (diff)
downloadv8-7314a9fc107bf9db96327cccfaa9b890e529b018.tar.gz
Upgrade V8 to 8.8.278.14
Bug: 162604069 Bug: 167389063 Test: gts-tradefed run gts-dev --module GtsGmscoreHostTestCases --test com.google.android.gts.devicepolicy.DeviceOwnerTest#testProxyPacProxyTest Test: m -j proxy_resolver_v8_unittest && adb sync && adb shell \ /data/nativetest/proxy_resolver_v8_unittest/proxy_resolver_v8_unittest Change-Id: Ifb09923b9d7f6d8990fb062d7dc0294edf2c098e
Diffstat (limited to 'testing')
-rw-r--r--testing/gmock/BUILD.gn9
-rw-r--r--testing/gmock/OWNERS2
-rw-r--r--testing/gmock/include/gmock/gmock-generated-function-mockers.h10
-rw-r--r--testing/gtest/BUILD.gn18
-rw-r--r--testing/gtest/OWNERS2
5 files changed, 6 insertions, 35 deletions
diff --git a/testing/gmock/BUILD.gn b/testing/gmock/BUILD.gn
index 0e203cb6..de5ae539 100644
--- a/testing/gmock/BUILD.gn
+++ b/testing/gmock/BUILD.gn
@@ -12,13 +12,10 @@ source_set("gmock") {
testonly = true
sources = [
"include/gmock/gmock-actions.h",
- "include/gmock/gmock-generated-function-mockers.h",
"include/gmock/gmock-matchers.h",
"include/gmock/gmock.h",
]
- deps = [
- "//third_party/googletest:gmock",
- ]
+ deps = [ "//third_party/googletest:gmock" ]
public_configs = [
"//third_party/googletest:gmock_config",
@@ -31,7 +28,5 @@ source_set("gmock") {
# into //third_party/googletest.
source_set("gmock_main") {
testonly = true
- deps = [
- "//third_party/googletest:gmock_main",
- ]
+ deps = [ "//third_party/googletest:gmock_main" ]
}
diff --git a/testing/gmock/OWNERS b/testing/gmock/OWNERS
deleted file mode 100644
index d5fa70ce..00000000
--- a/testing/gmock/OWNERS
+++ /dev/null
@@ -1,2 +0,0 @@
-thakis@chromium.org
-pwnall@chromium.org
diff --git a/testing/gmock/include/gmock/gmock-generated-function-mockers.h b/testing/gmock/include/gmock/gmock-generated-function-mockers.h
deleted file mode 100644
index b9986c7b..00000000
--- a/testing/gmock/include/gmock/gmock-generated-function-mockers.h
+++ /dev/null
@@ -1,10 +0,0 @@
-// Copyright 2017 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-// The file/directory layout of Google Test is not yet considered stable. Until
-// it stabilizes, Chromium code will use forwarding headers in testing/gtest
-// and testing/gmock, instead of directly including files in
-// third_party/googletest.
-
-#include "third_party/googletest/src/googlemock/include/gmock/gmock-generated-function-mockers.h"
diff --git a/testing/gtest/BUILD.gn b/testing/gtest/BUILD.gn
index fe7ba6d4..6636b2d9 100644
--- a/testing/gtest/BUILD.gn
+++ b/testing/gtest/BUILD.gn
@@ -4,9 +4,9 @@
import("//build_overrides/gtest.gni")
if (is_ios) {
+ import("//build/buildflag_header.gni")
import("//build/config/coverage/coverage.gni")
import("//build/config/ios/ios_sdk.gni")
- import("//build/buildflag_header.gni")
}
config("gtest_direct_config") {
@@ -40,9 +40,7 @@ static_library("gtest") {
# Android. https://codereview.chromium.org/2852613002/#ps20001
"empty.cc",
]
- public_deps = [
- "//third_party/googletest:gtest",
- ]
+ public_deps = [ "//third_party/googletest:gtest" ]
public_configs = [ ":gtest_direct_config" ]
@@ -58,9 +56,6 @@ static_library("gtest") {
}
if ((is_mac || is_ios) && gtest_include_objc_support) {
- if (is_ios) {
- set_sources_assignment_filter([])
- }
sources += [
"../gtest_mac.h",
"../gtest_mac.mm",
@@ -68,7 +63,6 @@ static_library("gtest") {
if (gtest_include_platform_test) {
sources += [ "../platform_test_mac.mm" ]
}
- set_sources_assignment_filter(sources_assignment_filter)
}
if (is_ios && gtest_include_ios_coverage) {
@@ -76,9 +70,7 @@ static_library("gtest") {
"../coverage_util_ios.h",
"../coverage_util_ios.mm",
]
- deps = [
- ":ios_enable_coverage",
- ]
+ deps = [ ":ios_enable_coverage" ]
}
}
@@ -87,9 +79,7 @@ static_library("gtest") {
# into //third_party/googletest.
source_set("gtest_main") {
testonly = true
- deps = [
- "//third_party/googletest:gtest_main",
- ]
+ deps = [ "//third_party/googletest:gtest_main" ]
}
if (is_ios) {
diff --git a/testing/gtest/OWNERS b/testing/gtest/OWNERS
deleted file mode 100644
index d5fa70ce..00000000
--- a/testing/gtest/OWNERS
+++ /dev/null
@@ -1,2 +0,0 @@
-thakis@chromium.org
-pwnall@chromium.org