| OLD | NEW |
| 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 } |
| OLD | NEW |