Revert "Build dEQP tests only with build_angle_deqp_tests==1."

This reverts commits 69b3aebb6fcc494d201d428a7ae073a0f424471e and
de3cd13d57602a4d17223145a996e69394486bee .

BUG=591281, 586565
CQ_INCLUDE_TRYBOTS=tryserver.chromium.win:win_optional_gpu_tests_rel;tryserver.chromium.mac:mac_optional_gpu_tests_rel
TBR=piman@chromium.org
NOTRY=true

Review URL: https://codereview.chromium.org/1756673003

Cr-Commit-Position: refs/heads/master@{#378847}

1 files changed, 56 insertions, 74 deletions

diff --git a/gpu/gpu.gyp b/gpu/gpu.gyp
index 0ce8122..8d5343f 100644
--- a/gpu/gpu.gyp
+++ b/gpu/gpu.gyp
@@ -5,7 +5,6 @@
 {
   'variables': {
     'nacl_win64_target': 0,
-    'build_angle_deqp_tests%': 0,
   },
   'includes': [
     'gpu_common.gypi',
@@ -498,79 +497,6 @@
         }],
       ],
     },
-    {
-      # Only build dEQP on test configs. Note that dEQP is test-only code,
-      # and is only a part of the Chromium build to allow easy integration
-      # with the GPU bot waterfall. (Note that dEQP uses exceptions, and
-      # currently can't build with Clang on Windows)
-      'target_name': 'angle_deqp_gles2_tests',
-      'conditions': [
-        ['build_angle_deqp_tests==1', {
-          '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_libgles2',
-          ],
-          'includes': [
-            '../third_party/angle/build/common_defines.gypi',
-          ],
-          'sources': [
-            'angle_deqp_tests_main.cc',
-          ],
-        }, {
-          # build_angle_deqp_tests==0
-          'type': 'none',
-        }],
-      ],
-    },
-    {
-      'target_name': 'angle_deqp_gles3_tests',
-      'conditions': [
-        ['build_angle_deqp_tests==1', {
-          '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',
-          ],
-        }, {
-          # build_angle_deqp_tests==0
-          'type': 'none',
-        }],
-      ],
-    },
-    {
-      'target_name': 'angle_deqp_egl_tests',
-      'conditions': [
-        ['build_angle_deqp_tests==1', {
-          '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_libegl',
-          ],
-          'includes': [
-            '../third_party/angle/build/common_defines.gypi',
-          ],
-          'sources': [
-            'angle_deqp_tests_main.cc',
-          ],
-        }, {
-          # build_angle_deqp_tests==0
-          'type': 'none',
-        }],
-      ],
-    },
   ],
   'conditions': [
     ['component=="static_library"', {
@@ -992,6 +918,62 @@
         },
       ],
     }],
+    ['(OS == "win" or OS == "linux") and archive_gpu_tests==1', {
+      'targets': [
+        {
+          # Only build dEQP on test configs. Note that dEQP is test-only code,
+          # and is only a part of the Chromium build to allow easy integration
+          # with the GPU bot waterfall. (Note that dEQP uses exceptions, and
+          # currently can't build with Clang on Windows)
+          'target_name': 'angle_deqp_gles2_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_libgles2',
+          ],
+          'includes': [
+            '../third_party/angle/build/common_defines.gypi',
+          ],
+          'sources': [
+            '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',
+          ],
+        },
+        {
+          'target_name': 'angle_deqp_egl_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_libegl',
+          ],
+          'includes': [
+            '../third_party/angle/build/common_defines.gypi',
+          ],
+          'sources': [
+            'angle_deqp_tests_main.cc',
+          ],
+        },
+      ],
+    }],
     ['OS == "android" and test_isolation_mode != "noop"',
       {
         'targets': [