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

Side by Side Diff: chrome/gles2_conform_test.isolate

Issue 1329783003: Revert of Fix sbox_validation_tests & Make isolate_driver.py include the executable itself (Closed) Base URL: https://chromium.googlesource.com/a/chromium/src.git@2_process
Patch Set: Created 5 years, 3 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/gl_tests.isolate ('k') | chrome/installer_util_unittests.isolate » ('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 2013 The Chromium Authors. All rights reserved. 1 # Copyright 2013 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 'includes': [ 5 'includes': [
6 '../base/base.isolate', 6 '../base/base.isolate',
7 '../ui/gl/gl.isolate', 7 '../ui/gl/gl.isolate',
8 ], 8 ],
9 'conditions': [ 9 'conditions': [
10 # TODO(kbr): add Android when these tests are run on those bots. 10 # TODO(kbr): add Android when these tests are run on those bots.
11 ['OS=="linux" or OS=="mac" or OS=="win"', { 11 ['OS=="linux" or OS=="mac" or OS=="win"', {
12 'variables': { 12 'variables': {
13 'command': [ 13 'command': [
14 '<(PRODUCT_DIR)/gles2_conform_test<(EXECUTABLE_SUFFIX)', 14 '<(PRODUCT_DIR)/gles2_conform_test<(EXECUTABLE_SUFFIX)',
15 ], 15 ],
16 'files': [ 16 'files': [
17 '<(PRODUCT_DIR)/gles2_conform_test<(EXECUTABLE_SUFFIX)',
17 '../gpu/gles2_conform_support/gles2_conform_test_expectations.txt', 18 '../gpu/gles2_conform_support/gles2_conform_test_expectations.txt',
18 ], 19 ],
19 }, 20 },
20 }], 21 }],
21 # .isolate format doesn't support nested conditions. 22 # .isolate format doesn't support nested conditions.
22 ['(OS=="linux" or OS=="mac" or OS=="win") and internal_gles2_conform_tests== 1', { 23 ['(OS=="linux" or OS=="mac" or OS=="win") and internal_gles2_conform_tests== 1', {
23 'variables': { 24 'variables': {
24 'files': [ 25 'files': [
25 '../third_party/gles2_conform/GTF_ES/', 26 '../third_party/gles2_conform/GTF_ES/',
26 '<(PRODUCT_DIR)/gles2_conform_test_windowless<(EXECUTABLE_SUFFIX)', 27 '<(PRODUCT_DIR)/gles2_conform_test_windowless<(EXECUTABLE_SUFFIX)',
27 # Could add gles2_conform_test_angle or 28 # Could add gles2_conform_test_angle or
28 # gles2_conform_test_chromeos if the bots were testing those. 29 # gles2_conform_test_chromeos if the bots were testing those.
29 ], 30 ],
30 }, 31 },
31 }], 32 }],
32 ], 33 ],
33 } 34 }
OLDNEW
« no previous file with comments | « chrome/gl_tests.isolate ('k') | chrome/installer_util_unittests.isolate » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698