diff options
| author | Matthew Netsch <quic_mnetsch@quicinc.com> | 2022-04-07 13:56:53 -0700 |
|---|---|---|
| committer | Matthew Netsch <quic_mnetsch@quicinc.com> | 2022-04-07 14:28:22 -0700 |
| commit | fa950b1e52ed5b0c0da52933cb753015680a0b2d (patch) | |
| tree | e1e548b637f734173f85845e0df8d79b5a302528 /executor | |
| parent | 9d81ccc8742744b029f88f7bcff8ed0ed05b364f (diff) | |
| parent | 1cb34e95e29346ffa71f89297ad3048e9b4e0cd9 (diff) | |
| download | VK-GL-CTS-fa950b1e52ed5b0c0da52933cb753015680a0b2d.tar.gz VK-GL-CTS-fa950b1e52ed5b0c0da52933cb753015680a0b2d.tar.bz2 VK-GL-CTS-fa950b1e52ed5b0c0da52933cb753015680a0b2d.zip | |
Merge vk-gl-cts/vulkan-cts-1.2.7 into vk-gl-cts/vulkan-cts-1.2.8
Change-Id: I2c051a776b06d23239eb3ce501a999088cd0c1de
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 6fbf792c0..fa1c91a3f 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 f4cce6e50..d69015ded 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 @@ -504,7 +502,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 2f3160155..6d4240367 100644 --- a/executor/xeTestResultParser.cpp +++ b/executor/xeTestResultParser.cpp @@ -467,8 +467,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")); |