dEQP-GLES2: Reland of "Skip flush/finish test on Windows."

src/tests/deqp_support/angle_deqp_gtest.cpp

@@ -54,14 +54,18 @@ class dEQPCaseList
         int mExpectation;
     };
 
+    void initialize();
+
     const CaseInfo &getCaseInfo(size_t caseIndex) const
     {
+        ASSERT(mInitialized);
         ASSERT(caseIndex < mCaseInfoList.size());
         return mCaseInfoList[caseIndex];
     }
 
     size_t numCases() const
     {
+        ASSERT(mInitialized);
         return mCaseInfoList.size();
     }
 
@@ -69,35 +73,50 @@ class dEQPCaseList
     std::vector<CaseInfo> mCaseInfoList;
     gpu::GPUTestExpectationsParser mTestExpectationsParser;
     gpu::GPUTestBotConfig mTestConfig;
+    size_t mTestModuleIndex;
+    bool mInitialized;
 };
 
 dEQPCaseList::dEQPCaseList(size_t testModuleIndex)
+    : mTestModuleIndex(testModuleIndex),
+      mInitialized(false)
+{
+}
+
+void dEQPCaseList::initialize()
 {
+    if (mInitialized)
+    {
+        return;
+    }
+
+    mInitialized = true;
+
     std::string exeDir = angle::GetExecutableDirectory();
 
     std::stringstream caseListPathStr;
-    caseListPathStr << exeDir << "/deqp_support/" << g_CaseListFiles[testModuleIndex];
+    caseListPathStr << exeDir << "/deqp_support/" << g_CaseListFiles[mTestModuleIndex];
     std::string caseListPath = caseListPathStr.str();
 
     std::stringstream testExpectationsPathStr;
     testExpectationsPathStr << exeDir << "/deqp_support/"
-                            << g_TestExpectationsFiles[testModuleIndex];
+                            << g_TestExpectationsFiles[mTestModuleIndex];
     std::string testExpectationsPath = testExpectationsPathStr.str();
 
     if (!mTestExpectationsParser.LoadTestExpectationsFromFile(testExpectationsPath))
     {
-        std::cerr << "Failed to load test expectations." << std::endl;
+        std::stringstream errorMsgStream;
         for (const auto &message : mTestExpectationsParser.GetErrorMessages())
         {
-            std::cerr << " " << message << std::endl;
+            errorMsgStream << std::endl << " " << message;
         }
-        return;
+
+        FAIL() << "Failed to load test expectations." << errorMsgStream.str();
     }
 
     if (!mTestConfig.LoadCurrentConfig(nullptr))
     {
-        std::cerr << "Failed to load test configuration." << std::endl;
-        return;
+        FAIL() << "Failed to load test configuration.";
     }
 
     std::stringstream caseListStream;
@@ -107,7 +126,7 @@ dEQPCaseList::dEQPCaseList(size_t testModuleIndex)
 
     if (fi == nullptr)
     {
-        return;
+        FAIL() << "Failed to read gzipped test information.";
     }
 
     gzrewind(fi);
@@ -154,6 +173,7 @@ class dEQPTest : public testing::TestWithParam<size_t>
     static const dEQPCaseList &GetCaseList()
     {
         static dEQPCaseList sCaseList(TestModuleIndex);
+        sCaseList.initialize();
         return sCaseList;
     }
 

src/tests/deqp_support/deqp_gles2_test_expectations.txt

@@ -568,7 +568,9 @@
 1032 WIN LINUX : dEQP-GLES2.functional.state_query.shader.program_attached_shaders = FAIL
 1034 WIN LINUX : dEQP-GLES2.functional.flush_finish.flush = FAIL
 1034 WIN LINUX : dEQP-GLES2.functional.flush_finish.finish = FAIL
-1034 WIN LINUX : dEQP-GLES2.functional.flush_finish.finish_wait = FAIL
+
+// Skip this test on Windows due to timeouts
+1034 WIN LINUX : dEQP-GLES2.functional.flush_finish.finish_wait = SKIP
 
 // Don't run these tests for faster turnover
 998 WIN LINUX : dEQP-GLES2.performance.* = SKIP