Add waived tests support for cts tools

Add TESTSTATUSCODE_WAIVER definition for cts tools to support waived tests.

Components: OpenGL ES
VK-GL-CTS issue: 2666

Change-Id: I99811c73bb96ec45cb0e5cbfab7d073bca4653db

diff --git a/executor/xeTestCaseResult.cpp b/executor/xeTestCaseResult.cpp
index 5e56fa4..b4d93c2 100644 (file)
--- a/executor/xeTestCaseResult.cpp
+++ b/executor/xeTestCaseResult.cpp
@@ -47,6 +47,7 @@ const char* getTestStatusCodeName (TestStatusCode code)
                case TESTSTATUSCODE_CRASH:                                      return "Crash";
                case TESTSTATUSCODE_DISABLED:                           return "Disabled";
                case TESTSTATUSCODE_TERMINATED:                         return "Terminated";
+               case TESTSTATUSCODE_WAIVER:                                     return "Waived";
                default:
                        DE_ASSERT(false);
                        return DE_NULL;

diff --git a/executor/xeTestCaseResult.hpp b/executor/xeTestCaseResult.hpp
index 1f53607..79f0465 100644 (file)
--- a/executor/xeTestCaseResult.hpp
+++ b/executor/xeTestCaseResult.hpp
@@ -49,6 +49,7 @@ enum TestStatusCode
        TESTSTATUSCODE_CRASH,                                   //!< Test executable crashed before finishing the test.
        TESTSTATUSCODE_DISABLED,                                //!< Test case disabled (for current target)
        TESTSTATUSCODE_TERMINATED,                              //!< Terminated for other reason.
+       TESTSTATUSCODE_WAIVER,                                  //!< Test case waived.
 
        TESTSTATUSCODE_LAST
 };

diff --git a/executor/xeTestResultParser.cpp b/executor/xeTestResultParser.cpp
index b14e7b2..c21ddd5 100644 (file)
--- a/executor/xeTestResultParser.cpp
+++ b/executor/xeTestResultParser.cpp
@@ -97,7 +97,8 @@ static const EnumMapEntry s_statusCodeMap[] =
        { 0x42b6efac,   "Timeout",                              TESTSTATUSCODE_TIMEOUT                                  },
        { 0x0cfb98f6,   "Crash",                                TESTSTATUSCODE_CRASH                                    },
        { 0xe326e01d,   "Disabled",                             TESTSTATUSCODE_DISABLED                                 },
-       { 0x77061af2,   "Terminated",                   TESTSTATUSCODE_TERMINATED                               }
+       { 0x77061af2,   "Terminated",                   TESTSTATUSCODE_TERMINATED                               },
+       { 0xd9e6b393,   "Waiver",                           TESTSTATUSCODE_WAIVER                                   }
 };
 
 static const EnumMapEntry s_resultItemMap[] =