diff options
| -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 | ||||
| -rw-r--r-- | gpu/gpu.gyp | 16 |
4 files changed, 54 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', + ], + }, ], }], ], diff --git a/gpu/gpu.gyp b/gpu/gpu.gyp index 7c154c0..c32d64e 100644 --- a/gpu/gpu.gyp +++ b/gpu/gpu.gyp @@ -796,6 +796,22 @@ 'angle_deqp_tests_main.cc', ], }, + { + 'target_name': 'angle_deqp_gles3_tests', + 'type': '<(gtest_target_type)', + 'dependencies': [ + '../base/base.gyp:base', + '../base/base.gyp:test_support_base', + '../third_party/angle/src/tests/tests.gyp:angle_deqp_gtest_support', + '../third_party/angle/src/tests/tests.gyp:angle_deqp_libgles3', + ], + 'includes': [ + '../third_party/angle/build/common_defines.gypi', + ], + 'sources': [ + 'angle_deqp_tests_main.cc', + ], + }, ], }] ], |