diff options
| author | jmadill <jmadill@chromium.org> | 2015-07-23 06:25:32 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-07-23 13:26:00 +0000 |
| commit | de540953570e2c6fe38271ff07f63cc3b68148cf (patch) | |
| tree | 8420a485b328586ad59d966685e7f92104b35cd1 /chrome | |
| parent | 0faad043887a87ff4487d83dae319aa202c66d0d (diff) | |
| download | chromium_src-de540953570e2c6fe38271ff07f63cc3b68148cf.zip chromium_src-de540953570e2c6fe38271ff07f63cc3b68148cf.tar.gz chromium_src-de540953570e2c6fe38271ff07f63cc3b68148cf.tar.bz2 | |
Add ANGLE dEQP-GLES3 tests.
This will allow us to put the GLES3 tests on the GPU FYI bots.
Also remove the old expectations file from the isolate.
BUG=510822
Review URL: https://codereview.chromium.org/1249623006
Cr-Commit-Position: refs/heads/master@{#340082}
Diffstat (limited to 'chrome')
| -rw-r--r-- | chrome/angle_deqp_gles2_tests.isolate | 2 | ||||
| -rw-r--r-- | chrome/angle_deqp_gles3_tests.isolate | 27 | ||||
| -rw-r--r-- | chrome/chrome_tests.gypi | 11 |
3 files changed, 38 insertions, 2 deletions
diff --git a/chrome/angle_deqp_gles2_tests.isolate b/chrome/angle_deqp_gles2_tests.isolate index d45f0fb..092b890 100644 --- a/chrome/angle_deqp_gles2_tests.isolate +++ b/chrome/angle_deqp_gles2_tests.isolate @@ -18,8 +18,6 @@ '<(PRODUCT_DIR)/angle_deqp_libgles2.dll', '<(PRODUCT_DIR)/angle_deqp_gles2_tests<(EXECUTABLE_SUFFIX)', '<(PRODUCT_DIR)/deqp_support/deqp_gles2_test_expectations.txt', - # TODO(jmadill): Remove this once we can switch over in ANGLE. - '<(PRODUCT_DIR)/deqp_support/deqp_test_expectations.txt', '<(PRODUCT_DIR)/deqp_support/dEQP-GLES2-cases.txt.gz', '../third_party/deqp/src/data/', ], diff --git a/chrome/angle_deqp_gles3_tests.isolate b/chrome/angle_deqp_gles3_tests.isolate new file mode 100644 index 0000000..a8170bb --- /dev/null +++ b/chrome/angle_deqp_gles3_tests.isolate @@ -0,0 +1,27 @@ +# 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. +# TOOD(jmadill): disable gtest batching +{ + 'includes': [ + '../base/base.isolate', + '../ui/gl/gl.isolate', + ], + 'conditions': [ + ['OS=="win"', { + 'variables': { + 'command': [ + '<(PRODUCT_DIR)/angle_deqp_gles3_tests<(EXECUTABLE_SUFFIX)', + '--test-launcher-batch-limit=400', + ], + 'files': [ + '<(PRODUCT_DIR)/angle_deqp_libgles3.dll', + '<(PRODUCT_DIR)/angle_deqp_gles3_tests<(EXECUTABLE_SUFFIX)', + '<(PRODUCT_DIR)/deqp_support/deqp_gles3_test_expectations.txt', + '<(PRODUCT_DIR)/deqp_support/dEQP-GLES3-cases.txt.gz', + '../third_party/deqp/src/data/', + ], + }, + }], + ], +} diff --git a/chrome/chrome_tests.gypi b/chrome/chrome_tests.gypi index 9de0536..c162164 100644 --- a/chrome/chrome_tests.gypi +++ b/chrome/chrome_tests.gypi @@ -3342,6 +3342,17 @@ 'angle_deqp_gles2_tests.isolate', ], }, + { + 'target_name': 'angle_deqp_gles3_tests_run', + 'type': 'none', + 'dependencies': [ + '../gpu/gpu.gyp:angle_deqp_gles3_tests', + 'gpu_tests_base', + ], + 'sources': [ + 'angle_deqp_gles3_tests.isolate', + ], + }, ], }], ], |