diff options
| author | Matthew Netsch <quic_mnetsch@quicinc.com> | 2022-04-07 11:47:24 -0700 |
|---|---|---|
| committer | Matthew Netsch <quic_mnetsch@quicinc.com> | 2022-04-07 19:39:13 +0000 |
| commit | c27bb6b6bfcfee0793d9c97734319914ee3553a9 (patch) | |
| tree | 09eb804cb31d5f96bae6c53a0af5aba5abe0dd6e /executor | |
| parent | 21a1cffa2100ffcbcecfe171c1779ad1fcc64c58 (diff) | |
| parent | c58417eb51eb7aed6e9cc86d3aee91f8a0e175d9 (diff) | |
| download | VK-GL-CTS-c27bb6b6bfcfee0793d9c97734319914ee3553a9.tar.gz VK-GL-CTS-c27bb6b6bfcfee0793d9c97734319914ee3553a9.tar.bz2 VK-GL-CTS-c27bb6b6bfcfee0793d9c97734319914ee3553a9.zip | |
Merge vk-gl-cts/vulkan-cts-1.2.6 into vk-gl-cts/vulkan-cts-1.2.7
Change-Id: I69f0b9b087df9c33b26ddd014fc1a291fc50dbdd
Diffstat (limited to 'executor')
| -rw-r--r-- | executor/xeTestCaseResult.hpp | 1 | ||||
| -rw-r--r-- | executor/xeTestLogWriter.cpp | 4 | ||||
| -rw-r--r-- | executor/xeTestResultParser.cpp | 5 |
3 files changed, 5 insertions, 5 deletions
diff --git a/executor/xeTestCaseResult.hpp b/executor/xeTestCaseResult.hpp index 79f04650d..052127a6f 100644 --- a/executor/xeTestCaseResult.hpp +++ b/executor/xeTestCaseResult.hpp @@ -116,6 +116,7 @@ class TestCaseResultHeader public: TestCaseResultHeader (void) : caseType(TESTCASETYPE_LAST), statusCode(TESTSTATUSCODE_LAST) {} + std::string caseVersion; //!< Test case version. std::string casePath; //!< Full test case path. TestCaseType caseType; //!< Test case type. TestStatusCode statusCode; //!< Test status code. diff --git a/executor/xeTestLogWriter.cpp b/executor/xeTestLogWriter.cpp index c7e389a52..781b376fb 100644 --- a/executor/xeTestLogWriter.cpp +++ b/executor/xeTestLogWriter.cpp @@ -30,8 +30,6 @@ namespace xe { -static const char* TEST_LOG_VERSION = "0.3.3"; - /* Batch result writer. */ struct ContainerValue @@ -502,7 +500,7 @@ void writeTestResult (const TestCaseResult& result, xe::xml::Writer& xmlWriter) using xml::Writer; xmlWriter << Writer::BeginElement("TestCaseResult") - << Writer::Attribute("Version", TEST_LOG_VERSION) + << Writer::Attribute("Version", result.caseVersion) << Writer::Attribute("CasePath", result.casePath) << Writer::Attribute("CaseType", getTestCaseTypeName(result.caseType)); diff --git a/executor/xeTestResultParser.cpp b/executor/xeTestResultParser.cpp index c21ddd54d..66dea83ee 100644 --- a/executor/xeTestResultParser.cpp +++ b/executor/xeTestResultParser.cpp @@ -465,8 +465,9 @@ void TestResultParser::handleElementStart (void) m_logVersion = getTestLogVersion(version); // \note Currently assumed that all known log versions are supported. - m_result->casePath = getAttribute("CasePath"); - m_result->caseType = TESTCASETYPE_SELF_VALIDATE; + m_result->caseVersion = version; + m_result->casePath = getAttribute("CasePath"); + m_result->caseType = TESTCASETYPE_SELF_VALIDATE; if (m_xmlParser.hasAttribute("CaseType")) m_result->caseType = getTestCaseType(m_xmlParser.getAttribute("CaseType")); |