dEQP: Shorten test case names.

Instead of dEQP_GLES2.Default/functional.blah... Use dEQP.GLES2/functional.blah... This makes them a bit easier to parse and reconstruct from memory. Bug: angleproject:2557 Change-Id: I092dc6ef10d4451ddafe373e699a5d35247f8785 Reviewed-on: https://chromium-review.googlesource.com/1062065Reviewed-by: Geoff Lang <geofflang@chromium.org> Commit-Queue: Jamie Madill <jmadill@chromium.org>

dEQP: Shorten test case names.
1ce8aede · Jamie Madill · Commit Bot · 0e1c158e · 1ce8aede
Commit 1ce8aede authored May 17, 2018 by Jamie Madill Committed by Commit Bot May 17, 2018
Hide whitespace changes
Inline Side-by-side

Showing with 13 additions and 13 deletions

angle_deqp_gtest.cpp src/tests/deqp_support/angle_deqp_gtest.cpp +13 -13

No files found.
--- a/src/tests/deqp_support/angle_deqp_gtest.cpp
+++ b/src/tests/deqp_support/angle_deqp_gtest.cpp
@@ -381,31 +381,31 @@ void dEQPTest<TestModuleIndex>::TearDownTestCase()
    deqp_libtester_shutdown_platform();
 }

-#define ANGLE_INSTANTIATE_DEQP_TEST_CASE(DEQP_TEST, N)                          \
-    class DEQP_TEST : public dEQPTest<N>                                        \
-    {                                                                           \
-    };                                                                          \
-    TEST_P(DEQP_TEST, Default) { runTest(); }                                   \
-                                                                                \
-    INSTANTIATE_TEST_CASE_P(, DEQP_TEST, DEQP_TEST::GetTestingRange(),          \
-                            [](const testing::TestParamInfo<size_t> &info) {    \
-                                return DEQP_TEST::GetCaseGTestName(info.param); \
+#define ANGLE_INSTANTIATE_DEQP_TEST_CASE(API, N)                             \
+    class dEQP : public dEQPTest<N>                                          \
+    {                                                                        \
+    };                                                                       \
+    TEST_P(dEQP, API) { runTest(); }                                         \
+                                                                             \
+    INSTANTIATE_TEST_CASE_P(, dEQP, dEQP::GetTestingRange(),                 \
+                            [](const testing::TestParamInfo<size_t> &info) { \
+                                return dEQP::GetCaseGTestName(info.param);   \
                            })

 #ifdef ANGLE_DEQP_GLES2_TESTS
-ANGLE_INSTANTIATE_DEQP_TEST_CASE(dEQP_GLES2, 0);
+ANGLE_INSTANTIATE_DEQP_TEST_CASE(GLES2, 0);
 #endif

 #ifdef ANGLE_DEQP_GLES3_TESTS
-ANGLE_INSTANTIATE_DEQP_TEST_CASE(dEQP_GLES3, 1);
+ANGLE_INSTANTIATE_DEQP_TEST_CASE(GLES3, 1);
 #endif

 #ifdef ANGLE_DEQP_GLES31_TESTS
-ANGLE_INSTANTIATE_DEQP_TEST_CASE(dEQP_GLES31, 2);
+ANGLE_INSTANTIATE_DEQP_TEST_CASE(GLES31, 2);
 #endif

 #ifdef ANGLE_DEQP_EGL_TESTS
-ANGLE_INSTANTIATE_DEQP_TEST_CASE(dEQP_EGL, 3);
+ANGLE_INSTANTIATE_DEQP_TEST_CASE(EGL, 3);
 #endif

 void HandleDisplayType(const char *displayTypeString)