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

Unified Diff: gpu/gpu_unittests.isolate

Issue 862133002: Update from https://crrev.com/312398 (Closed) Base URL: git@github.com:domokit/mojo.git@master
Patch Set: Created 5 years, 11 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « gpu/gpu_config.gypi ('k') | mojo/common/BUILD.gn » ('j') | shell/BUILD.gn » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: gpu/gpu_unittests.isolate
diff --git a/base/base_unittests.isolate b/gpu/gpu_unittests.isolate
similarity index 61%
copy from base/base_unittests.isolate
copy to gpu/gpu_unittests.isolate
index f561d209cf5920b95b36562e9edc01f0db678469..3380606ccdf2b81e3ee94240632edfeab37782dd 100644
--- a/base/base_unittests.isolate
+++ b/gpu/gpu_unittests.isolate
@@ -1,12 +1,13 @@
-# Copyright (c) 2012 The Chromium Authors. All rights reserved.
+# Copyright 2015 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.
{
'conditions': [
- ['OS=="android" or OS=="linux" or OS=="mac" or OS=="win"', {
+ ['OS=="linux" or OS=="mac" or OS=="win"', {
'variables': {
'files': [
- 'test/data/',
+ '../testing/test_env.py',
+ '<(PRODUCT_DIR)/gpu_unittests<(EXECUTABLE_SUFFIX)',
],
},
}],
@@ -15,7 +16,7 @@
'command': [
'../testing/xvfb.py',
'<(PRODUCT_DIR)',
- '<(PRODUCT_DIR)/base_unittests<(EXECUTABLE_SUFFIX)',
+ '<(PRODUCT_DIR)/gpu_unittests',
'--brave-new-test-launcher',
'--test-launcher-bot-mode',
'--asan=<(asan)',
@@ -23,30 +24,27 @@
],
'files': [
'../testing/xvfb.py',
+ '<(PRODUCT_DIR)/xdisplaycheck',
],
},
}],
- ['OS=="linux" and use_ozone==0', {
- 'variables': {
- 'files': [
- '<(PRODUCT_DIR)/xdisplaycheck<(EXECUTABLE_SUFFIX)',
- ],
- },
- }],
- ['OS=="linux" or OS=="mac" or OS=="win"', {
+ ['OS=="mac"', {
'variables': {
- 'files': [
+ 'command': [
'../testing/test_env.py',
- '<(PRODUCT_DIR)/base_unittests<(EXECUTABLE_SUFFIX)',
+ '<(PRODUCT_DIR)/gpu_unittests',
+ '--brave-new-test-launcher',
+ '--test-launcher-bot-mode',
+ '--asan=<(asan)',
+ '--lsan=<(lsan)',
],
- 'read_only': 1,
},
}],
- ['OS=="mac" or OS=="win"', {
+ ['OS=="win"', {
'variables': {
'command': [
'../testing/test_env.py',
- '<(PRODUCT_DIR)/base_unittests<(EXECUTABLE_SUFFIX)',
+ '<(PRODUCT_DIR)/gpu_unittests.exe',
'--brave-new-test-launcher',
'--test-launcher-bot-mode',
'--asan=<(asan)',
@@ -57,12 +55,12 @@
['OS=="win" and (fastbuild==0 or fastbuild==1)', {
'variables': {
'files': [
- '<(PRODUCT_DIR)/base_unittests.exe.pdb',
+ '<(PRODUCT_DIR)/gpu_unittests.exe.pdb',
],
},
}],
],
'includes': [
- 'base.isolate',
+ '../base/base.isolate',
],
}
« no previous file with comments | « gpu/gpu_config.gypi ('k') | mojo/common/BUILD.gn » ('j') | shell/BUILD.gn » ('J')

Powered by Google App Engine
This is Rietveld 408576698