Test for missing index dirty bit bug

src/tests/angle_end2end_tests_expectations.txt

@@ -4,11 +4,20 @@
 
 // See deqp_support/README.md for format.
 
+// Generic
+// Fails in the flush thread when calling eglMakeCurrent.
+6063 OPENGL : SimpleStateChangeTestES31.DrawThenChangeFBOThenDrawThenFlushInAnotherThreadThenDrawIndexed/* = SKIP
+6063 GLES : SimpleStateChangeTestES31.DrawThenChangeFBOThenDrawThenFlushInAnotherThreadThenDrawIndexed/* = SKIP
+
 // Windows
 3786 WIN NVIDIA D3D11 : BufferDataOverflowTest.VertexBufferIntegerOverflow/ES3_D3D11 = SKIP
 4092 WIN VULKAN : BufferDataOverflowTest.VertexBufferIntegerOverflow/ES3_Vulkan* = SKIP
 4092 WIN OPENGL : BufferDataOverflowTest.VertexBufferIntegerOverflow/ES3_OpenGL = SKIP
 4092 WIN GLES : BufferDataOverflowTest.VertexBufferIntegerOverflow/ES3_OpenGLES = SKIP
+6064 WIN D3D11 : SimpleStateChangeTestES31.DrawThenChangeFBOThenDrawThenFlushInAnotherThreadThenDrawIndexed/* = SKIP
+
+// Linux
+6065 LINUX INTEL VULKAN : SimpleStateChangeTestES31.DrawThenUpdateUBOThenDrawThenDrawIndexed/* = SKIP
 
 // Mac
 6025 MAC AMD OPENGL : IndexBufferOffsetTestES3.UseAsUBOThenUpdateThenUInt8Index/ES3_OpenGL = SKIP

src/tests/angle_end2end_tests_main.cpp

@@ -42,6 +42,9 @@ int main(int argc, char **argv)
         return EXIT_FAILURE;
     }
 
+    // end2end test expectations only allow SKIP at the moment.
+    testSuite.setTestExpectationsAllowMask(angle::GPUTestExpectationsParser::kGpuTestSkip);
+
     if (!testSuite.loadAllTestExpectationsFromFile(std::string(foundDataPath.data())))
     {
         return EXIT_FAILURE;

src/tests/test_expectations/GPUTestExpectationsParser.cpp

@@ -107,6 +107,7 @@ enum ErrorType
     kErrorIllegalEntry,
     kErrorInvalidEntry,
     kErrorEntryWithExpectationConflicts,
+    kErrorEntryWithDisallowedExpectation,
     kErrorEntriesOverlap,
 
     kNumberOfErrors,
@@ -195,6 +196,7 @@ const char *kErrorMessage[kNumberOfErrors] = {
     "entry with wrong format",
     "entry invalid, likely unimplemented modifiers",
     "entry with expectation modifier conflicts",
+    "entry with unsupported expectation",
     "two entries' configs overlap",
 };
 
@@ -294,6 +296,10 @@ const char *GetConditionName(uint32_t condition)
 }
 
 GPUTestExpectationsParser::GPUTestExpectationsParser()
+    : mExpectationsAllowMask(
+          GPUTestExpectationsParser::kGpuTestPass | GPUTestExpectationsParser::kGpuTestFail |
+          GPUTestExpectationsParser::kGpuTestFlaky | GPUTestExpectationsParser::kGpuTestTimeout |
+          GPUTestExpectationsParser::kGpuTestSkip)
 {
     // Some initial checks.
     ASSERT((static_cast<unsigned int>(kNumberOfTokens)) ==
@@ -582,6 +588,12 @@ bool GPUTestExpectationsParser::parseLine(const GPUTestConfig *config,
                                      lineNumber);
                     return false;
                 }
+                if ((mExpectationsAllowMask & kTokenData[token].expectation) == 0)
+                {
+                    pushErrorMessage(kErrorMessage[kErrorEntryWithDisallowedExpectation],
+                                     lineNumber);
+                    return false;
+                }
                 entry.testExpectation = kTokenData[token].expectation;
                 if (stage == kLineParserEqual)
                     stage++;

src/tests/test_expectations/GPUTestExpectationsParser.h

@@ -51,6 +51,7 @@ class GPUTestExpectationsParser
     // Get the test expectation of a given test on a given bot.
     int32_t getTestExpectation(const std::string &testName);
     int32_t getTestExpectationWithConfig(const GPUTestConfig &config, const std::string &testName);
+    void setTestExpectationsAllowMask(uint32_t mask) { mExpectationsAllowMask = mask; }
 
   private:
     struct GPUTestExpectationEntry
@@ -95,6 +96,8 @@ class GPUTestExpectationsParser
 
     std::vector<GPUTestExpectationEntry> mEntries;
     std::vector<std::string> mErrorMessages;
+
+    uint32_t mExpectationsAllowMask;
 };
 
 const char *GetConditionName(uint32_t condition);

src/tests/test_utils/runner/TestSuite.h

@@ -152,6 +152,10 @@ class TestSuite
     int32_t getTestExpectation(const std::string &testName);
     int32_t getTestExpectationWithConfig(const GPUTestConfig &config, const std::string &testName);
     bool logAnyUnusedTestExpectations();
+    void setTestExpectationsAllowMask(uint32_t mask)
+    {
+        mTestExpectationsParser.setTestExpectationsAllowMask(mask);
+    }
 
   private:
     bool parseSingleArg(const char *argument);