diff options
| author | gman@chromium.org <gman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-07-24 01:27:17 +0000 |
|---|---|---|
| committer | gman@chromium.org <gman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-07-24 01:27:17 +0000 |
| commit | 9e1149d704c069ab655740b4523fbe254018a6e5 (patch) | |
| tree | 0aad1b4ecf0ecd392f342e820dd1b30c54711307 /build | |
| parent | a87b524cc95ea1dc06e79c843ca346b0f4284b6b (diff) | |
| download | chromium_src-9e1149d704c069ab655740b4523fbe254018a6e5.zip chromium_src-9e1149d704c069ab655740b4523fbe254018a6e5.tar.gz chromium_src-9e1149d704c069ab655740b4523fbe254018a6e5.tar.bz2 | |
Conditionally add the OpenGL ES 2.0 conformance tests to all.gyp
This is a step to getting the OpenGL ES 2.0 conformance tests
running on the gpu bots. Actually running them will be another CL or 2.
TEST=they build
BUG=none
Review URL: https://chromiumcodereview.appspot.com/10796101
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@148023 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'build')
| -rw-r--r-- | build/all.gyp | 14 | ||||
| -rw-r--r-- | build/common.gypi | 3 |
2 files changed, 17 insertions, 0 deletions
diff --git a/build/all.gyp b/build/all.gyp index de9abff..8f221bf0 100644 --- a/build/all.gyp +++ b/build/all.gyp @@ -307,6 +307,13 @@ '../chrome/chrome.gyp:performance_ui_tests', '../gpu/gpu.gyp:gl_tests', ], + 'conditions': [ + ['internal_gles2_conform_tests', { + 'dependencies': [ + '../gpu/gles2_conform_test/gles2_conform_test.gyp:gles2_conform_test_windowless', + ], + }], # internal_gles2_conform + ], }, # target_name: chromium_gpu_builder { 'target_name': 'chromium_gpu_debug_builder', @@ -315,6 +322,13 @@ '../chrome/chrome.gyp:gpu_tests', '../gpu/gpu.gyp:gl_tests', ], + 'conditions': [ + ['internal_gles2_conform_tests', { + 'dependencies': [ + '../gpu/gles2_conform_test/gles2_conform_test.gyp:gles2_conform_test_windowless', + ], + }], # internal_gles2_conform + ], }, # target_name: chromium_gpu_debug_builder { 'target_name': 'chromium_builder_qa', diff --git a/build/common.gypi b/build/common.gypi index 0c568bb..f212d76 100644 --- a/build/common.gypi +++ b/build/common.gypi @@ -786,6 +786,9 @@ # Set to 1 to compile with the built in pdf viewer. 'internal_pdf%': 0, + # Set to 1 to compile with the OpenGL ES 2.0 conformance tests. + 'internal_gles2_conform_tests%': 0, + # NOTE: When these end up in the Mac bundle, we need to replace '-' for '_' # so Cocoa is happy (http://crbug.com/20441). 'locales': [ |