diff --git a/libkmstest/test.h b/libkmstest/test.h
index fbc4727d3d1e396848519b9d1e2a6f324f690a6e..3631f2ca2f384013ea3f7b12e7c5b7227bf215d3 100644 (file)
--- a/libkmstest/test.h
+++ b/libkmstest/test.h
#pragma once
#include "color.h"
-#include "conv.h"
-#include "testpat.h"
-#include "colorbar.h"
+#include "kmstest.h"
#define ARRAY_SIZE(arr) (sizeof(arr) / sizeof((arr)[0]))
#define unlikely(x) __builtin_expect(!!(x), 0)
-static void ASSERT_FAIL(const char *cond, const char *file,
- unsigned int line, const char *func) __attribute__ ((__noreturn__));
-
-static void ASSERT_FAIL(const char *cond, const char *file,
- unsigned int line, const char *func)
-{
- fprintf(stderr, "%s:%d: %s: ASSERT(%s) failed\n", file, line, func, cond);
- abort();
-}
-
-#define ASSERT(x) if (unlikely(!(x))) { ASSERT_FAIL( __STRING(x), __FILE__, __LINE__, __PRETTY_FUNCTION__); }
-
-static void FAIL_IF_FAIL(const char *txt, const char *file,
- unsigned int line, const char *func) __attribute__ ((__noreturn__));
-
-static void FAIL_IF_FAIL(const char *txt, const char *file,
- unsigned int line, const char *func)
-{
- fprintf(stderr, "%s:%d: %s: FAIL: %s\n", file, line, func, txt);
- abort();
-}
-
-#define FAIL_IF(x, y) if (unlikely(x)) { FAIL_IF_FAIL(y, __FILE__, __LINE__, __PRETTY_FUNCTION__); }
+#define ASSERT(x) \
+ if (unlikely(!(x))) { \
+ fprintf(stderr, "%s:%d: %s: ASSERT(%s) failed\n", __FILE__, __LINE__, __PRETTY_FUNCTION__, __STRING(x)); \
+ abort(); \
+ }
+
+#define FAIL(fmt, ...) \
+ do { \
+ fprintf(stderr, "%s:%d: %s:\n" fmt "\n", __FILE__, __LINE__, __PRETTY_FUNCTION__, ##__VA_ARGS__); \
+ abort(); \
+ } while(0)
+
+#define FAIL_IF(x, fmt, ...) \
+ if (unlikely(x)) { \
+ fprintf(stderr, "%s:%d: %s:\n" fmt "\n", __FILE__, __LINE__, __PRETTY_FUNCTION__, ##__VA_ARGS__); \
+ abort(); \
+ }
+
+#define EXIT(fmt, ...) \
+ do { \
+ fprintf(stderr, fmt "\n", ##__VA_ARGS__); \
+ exit(-1); \
+ } while(0)