Revert "Suppress crashing perftests on Win Intel Exp Rel"

This reverts commit f8e8fcf8. Reason for revert: ANGLE_SKIP_TEST_IF doesn't work in perftests and this skip is not needed since the whole suite is disabled now Original change's description: > Suppress crashing perftests on Win Intel Exp Rel > > Also moves ANGLE_SKIP_TEST_IF to a header shared between end2end and > perf tests. > > BUG=chromium:997674 > > Change-Id: I7c5968e6d861c4bff703ddc6ae0e4e021e47061f > Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/1768374 > Commit-Queue: Corentin Wallez <cwallez@chromium.org> > Reviewed-by: Jamie Madill <jmadill@chromium.org> TBR=geofflang@chromium.org,cwallez@chromium.org,jmadill@chromium.org # Not skipping CQ checks because original CL landed > 1 day ago. Bug: chromium:997674 Change-Id: I0a2124c93d1abd6c7efd2b29e942ee966982eed2 Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/1810763Reviewed-by: Yuly Novikov <ynovikov@chromium.org> Commit-Queue: Yuly Novikov <ynovikov@chromium.org>

Revert "Suppress crashing perftests on Win Intel Exp Rel"
e34564ba · Yuly Novikov · Commit Bot · 873079f1 · e34564ba · e34564ba
Commit e34564ba authored Sep 18, 2019 by Yuly Novikov Committed by Commit Bot Sep 18, 2019
6 changed files
--- a/src/tests/perf_tests/DrawCallPerf.cpp
+++ b/src/tests/perf_tests/DrawCallPerf.cpp
@@ -12,8 +12,6 @@
 #include "test_utils/draw_call_perf_utils.h"
 #include "util/shader_utils.h"
-using namespace angle;
 namespace
 {
 enum class StateChange
@@ -328,8 +326,6 @@ void DrawCallPerfBenchmark::drawBenchmark()
 TEST_P(DrawCallPerfBenchmark, Run)
 {
-    // TODO(crbug.com/997674) crashes on Win10 FYI x64 Exp Release (Intel HD 630)
-    ANGLE_SKIP_TEST_IF(IsWindows() && IsIntel());
    run();
 }

--- a/src/tests/perf_tests/LinkProgramPerfTest.cpp
+++ b/src/tests/perf_tests/LinkProgramPerfTest.cpp
@@ -204,8 +204,6 @@ LinkProgramParams LinkProgramVulkanParams(TaskOption taskOption, ThreadOption th
 TEST_P(LinkProgramBenchmark, Run)
 {
-    // TODO(crbug.com/997674) crashes on Win10 FYI x64 Exp Release (Intel HD 630)
-    ANGLE_SKIP_TEST_IF(IsWindows() && IsIntel());
    run();
 }

--- a/src/tests/perf_tests/MultiviewPerf.cpp
+++ b/src/tests/perf_tests/MultiviewPerf.cpp
@@ -567,8 +567,6 @@ MultiviewPerfParams SelectViewInVertexShader(const EGLPlatformParameters &eglPar
 TEST_P(MultiviewCPUBoundBenchmark, Run)
 {
-    // TODO(crbug.com/997674) crashes on Win10 FYI x64 Exp Release (Intel HD 630)
-    ANGLE_SKIP_TEST_IF(IsWindows() && IsIntel());
    run();
 }

--- a/src/tests/perf_tests/UniformsPerf.cpp
+++ b/src/tests/perf_tests/UniformsPerf.cpp
@@ -500,8 +500,6 @@ UniformsParams MatrixUniforms(const EGLPlatformParameters &egl,
 TEST_P(UniformsBenchmark, Run)
 {
-    // TODO(crbug.com/997674) crashes on Win10 FYI x64 Exp Release (Intel HD 630)
-    ANGLE_SKIP_TEST_IF(IsWindows() && IsIntel());
    run();
 }

--- a/src/tests/test_utils/ANGLETest.h
+++ b/src/tests/test_utils/ANGLETest.h
@@ -590,4 +590,14 @@ bool IsGLExtensionRequestable(const std::string &extName);
 extern angle::PlatformMethods gDefaultPlatformMethods;
+#define ANGLE_SKIP_TEST_IF(COND)                                  \
+    do                                                            \
+    {                                                             \
+        if (COND)                                                 \
+        {                                                         \
+            std::cout << "Test skipped: " #COND "." << std::endl; \
+            return;                                               \
+        }                                                         \
+    } while (0)
 #endif  // ANGLE_TESTS_ANGLE_TEST_H_
--- a/src/tests/test_utils/angle_test_instantiate.h
+++ b/src/tests/test_utils/angle_test_instantiate.h
@@ -139,14 +139,4 @@ extern std::string gSelectedConfig;
 extern bool gSeparateProcessPerConfig;
 }  // namespace angle
-#define ANGLE_SKIP_TEST_IF(COND)                                  \
-    do                                                            \
-    {                                                             \
-        if (COND)                                                 \
-        {                                                         \
-            std::cout << "Test skipped: " #COND "." << std::endl; \
-            return;                                               \
-        }                                                         \
-    } while (0)
 #endif  // ANGLE_TEST_INSTANTIATE_H_