diff options
| author | thakis <thakis@chromium.org> | 2015-06-30 11:48:14 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-06-30 18:50:47 +0000 |
| commit | cc04ed85ccb092e2cf8c361cc319713b46a70b39 (patch) | |
| tree | 89921905e6ce05901b7744fbec809787e60a877b /chrome | |
| parent | 067a8db65a4a9f1e0f2748b1c05b70a1a15cb7b7 (diff) | |
| download | chromium_src-cc04ed85ccb092e2cf8c361cc319713b46a70b39.zip chromium_src-cc04ed85ccb092e2cf8c361cc319713b46a70b39.tar.gz chromium_src-cc04ed85ccb092e2cf8c361cc319713b46a70b39.tar.bz2 | |
Revert of Add angle_deqp_tests target and isolate. (patchset #2 id:20001 of https://codereview.chromium.org/1219623008/)
Reason for revert:
Looks like deqb.gypi requires exceptions, deqp.gypi sets _HAS_EXCEPTIONS=1 and whatnot. This causes crbug.com/505888 and we generally don't enable exceptions anywhere in chrome code.
Original issue's description:
> Add angle_deqp_tests target and isolate.
>
> The dEQP tests provide extensive OpenGL ES2 coverage, and we plan to run
> them continuously on a Windows GPU FYI. Other platforms forthcoming.
>
> BUG=500736
> TEST=bots, manual testing with run_isolated.py
>
> Committed: https://crrev.com/965a48279e0e60226118234b7fdfd00db215e754
> Cr-Commit-Position: refs/heads/master@{#336806}
TBR=piman@chromium.org,maruel@chromium.org,kbr@chromium.org,jmadill@chromium.org
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=500736
Review URL: https://codereview.chromium.org/1211833003
Cr-Commit-Position: refs/heads/master@{#336834}
Diffstat (limited to 'chrome')
| -rw-r--r-- | chrome/angle_deqp_tests.isolate | 25 | ||||
| -rw-r--r-- | chrome/chrome_tests.gypi | 15 |
2 files changed, 0 insertions, 40 deletions
diff --git a/chrome/angle_deqp_tests.isolate b/chrome/angle_deqp_tests.isolate deleted file mode 100644 index 4cea17e..0000000 --- a/chrome/angle_deqp_tests.isolate +++ /dev/null @@ -1,25 +0,0 @@ -# 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', - '../third_party/angle/angle.isolate', - ], - 'conditions': [ - ['OS=="win"', { - 'variables': { - 'command': [ - '<(PRODUCT_DIR)/angle_deqp_tests<(EXECUTABLE_SUFFIX)', - ], - 'files': [ - '<(PRODUCT_DIR)/angle_deqp_tests<(EXECUTABLE_SUFFIX)', - '<(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/chrome_tests.gypi b/chrome/chrome_tests.gypi index 14db7fe..98c85c2 100644 --- a/chrome/chrome_tests.gypi +++ b/chrome/chrome_tests.gypi @@ -3284,21 +3284,6 @@ }, ], }], - ['OS=="win"', { - 'targets': [ - { - 'target_name': 'angle_deqp_tests_run', - 'type': 'none', - 'dependencies': [ - '../gpu/gpu.gyp:angle_deqp_tests', - 'gpu_tests_base', - ], - 'sources': [ - 'angle_deqp_tests.isolate', - ], - }, - ], - }], ], }], ], |