Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(342)

Side by Side Diff: chrome/test/BUILD.gn

Issue 2680283003: Switch mash_browser_tests to Ozone X11 platform. (Closed)
Patch Set: Drop --use-test-config, it's added automatically. Created 3 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « chrome/app/mash/BUILD.gn ('k') | testing/buildbot/chromium.chromiumos.json » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 # Copyright 2014 The Chromium Authors. All rights reserved. 1 # Copyright 2014 The Chromium Authors. All rights reserved.
2 # Use of this source code is governed by a BSD-style license that can be 2 # Use of this source code is governed by a BSD-style license that can be
3 # found in the LICENSE file. 3 # found in the LICENSE file.
4 4
5 import("//build/config/chrome_build.gni") 5 import("//build/config/chrome_build.gni")
6 import("//build/config/compiler/compiler.gni") 6 import("//build/config/compiler/compiler.gni")
7 import("//build/config/crypto.gni") 7 import("//build/config/crypto.gni")
8 import("//build/config/features.gni") 8 import("//build/config/features.gni")
9 import("//build/config/ui.gni") 9 import("//build/config/ui.gni")
10 import("//chrome/common/features.gni") 10 import("//chrome/common/features.gni")
(...skipping 1147 matching lines...) Expand 10 before | Expand all | Expand 10 after
1158 } 1158 }
1159 1159
1160 # TODO(GYP_GONE): Delete this after we've converted everything to GN. 1160 # TODO(GYP_GONE): Delete this after we've converted everything to GN.
1161 # The _run targets exist only for compatibility w/ GYP. 1161 # The _run targets exist only for compatibility w/ GYP.
1162 group("tab_capture_end2end_tests_run") { 1162 group("tab_capture_end2end_tests_run") {
1163 testonly = true 1163 testonly = true
1164 deps = [ 1164 deps = [
1165 ":browser_tests", 1165 ":browser_tests",
1166 ] 1166 ]
1167 } 1167 }
1168
1169 # TODO(GYP_GONE): Delete this after we've converted everything to GN.
1170 # The _run targets exist only for compatibility w/ GYP.
1171 group("mash_browser_tests_run") {
1172 testonly = true
1173 deps = [
1174 ":mash_browser_tests",
1175 ]
1176 }
1177
1178 group("mash_browser_tests") {
1179 testonly = true
1180 data_deps = [
1181 ":browser_tests",
1182 ]
1183 }
1184 } 1168 }
1185 1169
1186 static_library("browser_tests_runner") { 1170 static_library("browser_tests_runner") {
1187 testonly = true 1171 testonly = true
1188 sources = [] 1172 sources = []
1189 1173
1190 deps = [ 1174 deps = [
1191 ":test_support", 1175 ":test_support",
1192 ] 1176 ]
1193 1177
1194 if (is_chromeos) { 1178 if (enable_package_mash_services) {
1195 sources += [ 1179 sources += [
1196 "base/browser_tests_main_chromeos.cc", 1180 "base/browser_tests_main_chromeos.cc",
1197 "base/mash_browser_tests_main.cc", 1181 "base/mash_browser_tests_main.cc",
1198 "base/mash_browser_tests_main.h", 1182 "base/mash_browser_tests_main.h",
1199 "base/mojo_test_connector.cc", 1183 "base/mojo_test_connector.cc",
1200 "base/mojo_test_connector.h", 1184 "base/mojo_test_connector.h",
1201 ] 1185 ]
1202 1186
1203 deps += [ 1187 deps += [
1204 "//mash/package", 1188 "//mash/package",
(...skipping 3913 matching lines...) Expand 10 before | Expand all | Expand 10 after
5118 android_library("unit_tests_java") { 5102 android_library("unit_tests_java") {
5119 java_files = [ "android/unit_tests_apk/src/org/chromium/chrome/unit_tests_ap k/ChromeNativeTestApplication.java" ] 5103 java_files = [ "android/unit_tests_apk/src/org/chromium/chrome/unit_tests_ap k/ChromeNativeTestApplication.java" ]
5120 deps = [ 5104 deps = [
5121 "//base:base_java", 5105 "//base:base_java",
5122 "//chrome/android:chrome_java", 5106 "//chrome/android:chrome_java",
5123 "//content/public/android:content_java", 5107 "//content/public/android:content_java",
5124 ] 5108 ]
5125 } 5109 }
5126 } 5110 }
5127 5111
5128 if (is_chromeos) { 5112 if (enable_package_mash_services) {
fwang 2017/02/11 10:43:21 Quick note: This and/or the one above have caused
5113 # TODO(GYP_GONE): Delete this after we've converted everything to GN.
5114 # The _run targets exist only for compatibility w/ GYP.
5115 group("mash_browser_tests_run") {
5116 testonly = true
5117 deps = [
5118 ":mash_browser_tests",
5119 ]
5120 }
5121
5122 group("mash_browser_tests") {
5123 testonly = true
5124 data_deps = [
5125 ":browser_tests",
5126 "//chrome/app/mash:mash_service_overrides",
5127 ]
5128 }
5129
5129 service_manifest("mash_browser_tests_manifest") { 5130 service_manifest("mash_browser_tests_manifest") {
5130 name = "mash_browser_tests" 5131 name = "mash_browser_tests"
5131 5132
5132 source = "base/mash_browser_tests_manifest.json" 5133 source = "base/mash_browser_tests_manifest.json"
5133 packaged_services = [ 5134 packaged_services = [
5134 "//ash/autoclick/mus:manifest", 5135 "//ash/autoclick/mus:manifest",
5135 "//ash/mus:manifest", 5136 "//ash/mus:manifest",
5136 "//ash/touch_hud/mus:manifest", 5137 "//ash/touch_hud/mus:manifest",
5137 "//mash/catalog_viewer:manifest", 5138 "//mash/catalog_viewer:manifest",
5138 "//mash/quick_launch:manifest", 5139 "//mash/quick_launch:manifest",
(...skipping 28 matching lines...) Expand all
5167 } 5168 }
5168 5169
5169 if (is_win) { 5170 if (is_win) {
5170 loadable_module("conflicts_dll") { 5171 loadable_module("conflicts_dll") {
5171 testonly = true 5172 testonly = true
5172 sources = [ 5173 sources = [
5173 "conflicts/conflicts_dll.cc", 5174 "conflicts/conflicts_dll.cc",
5174 ] 5175 ]
5175 } 5176 }
5176 } 5177 }
OLDNEW
« no previous file with comments | « chrome/app/mash/BUILD.gn ('k') | testing/buildbot/chromium.chromiumos.json » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698