Enable use of std::string in TCU_FAIL macro
Extend TestError class with a constructor that accepts
std:string as a first parameter in 4-parameter constructor.
This enables to use statements like TCU_FAIL(std::string).
Components: Framework
VK-GL-CTS issue: 260
Change-Id: Ib7cf3eedd8eb22f3cdf9603e56e3fbcc69644d64
diff --git a/framework/common/tcuDefs.cpp b/framework/common/tcuDefs.cpp
index 10eb1fa..639f971 100644
--- a/framework/common/tcuDefs.cpp
+++ b/framework/common/tcuDefs.cpp
@@ -89,6 +89,10 @@
: TestException(message, expr, file, line, QP_TEST_RESULT_FAIL)
{
}
+TestError::TestError (const std::string& message, const char* expr, const char* file, int line)
+ : TestException(message.c_str(), expr, file, line, QP_TEST_RESULT_FAIL)
+{
+}
TestError::TestError (const std::string& message)
: TestException(message, QP_TEST_RESULT_FAIL)
diff --git a/framework/common/tcuDefs.hpp b/framework/common/tcuDefs.hpp
index 047c64f..b2a03df 100644
--- a/framework/common/tcuDefs.hpp
+++ b/framework/common/tcuDefs.hpp
@@ -78,6 +78,7 @@
{
public:
TestError (const char* message, const char* expr, const char* file, int line);
+ TestError (const std::string& message, const char* expr, const char* file, int line);
TestError (const std::string& message);
virtual ~TestError (void) throw() {}
};