[Libva] [PATCH intel-driver 01/11] test: move ASSERT_NO_FAILURE macro to test.h
U. Artie Eoff
ullysses.a.eoff at intel.com
Wed Sep 28 20:36:01 UTC 2016
Both jpeg decode and encode test files use this macro.
So move it to the common test.h header to avoid duplicating
it.
Signed-off-by: U. Artie Eoff <ullysses.a.eoff at intel.com>
---
test/i965_jpeg_decode_test.cpp | 4 ----
test/i965_jpeg_encode_test.cpp | 4 ----
test/test.h | 4 ++++
3 files changed, 4 insertions(+), 8 deletions(-)
diff --git a/test/i965_jpeg_decode_test.cpp b/test/i965_jpeg_decode_test.cpp
index b022c2e67c3e..6b8462564cfd 100644
--- a/test/i965_jpeg_decode_test.cpp
+++ b/test/i965_jpeg_decode_test.cpp
@@ -194,10 +194,6 @@ protected:
PictureData::SharedConst pd;
};
-#define ASSERT_NO_FAILURE(statement) \
- statement; \
- ASSERT_FALSE(HasFailure());
-
TEST_P(FourCCTest, Decode)
{
struct i965_driver_data *i965(*this);
diff --git a/test/i965_jpeg_encode_test.cpp b/test/i965_jpeg_encode_test.cpp
index 08d80c4f75b7..80ca1fdc62be 100644
--- a/test/i965_jpeg_encode_test.cpp
+++ b/test/i965_jpeg_encode_test.cpp
@@ -157,10 +157,6 @@ const TestInput::Shared NV12toI420(const TestInput::SharedConst& nv12)
return i420;
}
-#define ASSERT_NO_FAILURE(statement) \
- statement; \
- ASSERT_FALSE(HasFailure());
-
class JPEGEncodeInputTest
: public JPEGEncodeTest
, public ::testing::WithParamInterface<
diff --git a/test/test.h b/test/test.h
index afca9a5ed2d6..000284a2ca2e 100644
--- a/test/test.h
+++ b/test/test.h
@@ -66,6 +66,10 @@
#define ASSERT_PTR_NULL(ptr) \
ASSERT_TRUE(NULL == (ptr))
+#define ASSERT_NO_FAILURE(statement) \
+ statement; \
+ ASSERT_FALSE(HasFailure());
+
class VaapiStatus
{
public:
--
2.4.11
More information about the Libva
mailing list