From c77756c48d6f38c8b40a39fd53f610c296530adf Mon Sep 17 00:00:00 2001
From: Tomi Valkeinen <tomi.valkeinen@iki.fi>
Date: Thu, 1 Oct 2015 21:49:43 +0300
Subject: move test.h to libkmstest

---
 libkmstest/test.h | 21 +++++++++++++++++++++
 tests/db.cpp      |  3 ---
 tests/test.h      | 15 ---------------
 tests/testpat.cpp |  1 -
 4 files changed, 21 insertions(+), 19 deletions(-)
 create mode 100644 libkmstest/test.h
 delete mode 100644 tests/test.h

diff --git a/libkmstest/test.h b/libkmstest/test.h
new file mode 100644
index 0000000..0913e79
--- /dev/null
+++ b/libkmstest/test.h
@@ -0,0 +1,21 @@
+#pragma once
+
+#include "color.h"
+#include "conv.h"
+#include "testpat.h"
+
+#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__); }
+
+#define ARRAY_SIZE(arr) (sizeof(arr) / sizeof((arr)[0]))
diff --git a/tests/db.cpp b/tests/db.cpp
index 9b7c973..d70f917 100644
--- a/tests/db.cpp
+++ b/tests/db.cpp
@@ -6,7 +6,6 @@
 #include <drm_fourcc.h>
 
 #include "kms++.h"
-#include "color.h"
 
 #include "test.h"
 
@@ -17,8 +16,6 @@ static void draw_color_bar(Framebuffer& buf, int old_xpos, int xpos, int width);
 
 static void main_loop(Card& card);
 
-#define ARRAY_SIZE(arr) (sizeof(arr) / sizeof((arr)[0]))
-
 class OutputFlipHandler
 {
 public:
diff --git a/tests/test.h b/tests/test.h
deleted file mode 100644
index 090ff38..0000000
--- a/tests/test.h
+++ /dev/null
@@ -1,15 +0,0 @@
-#pragma once
-
-#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__); }
diff --git a/tests/testpat.cpp b/tests/testpat.cpp
index 419df5d..eaf1091 100644
--- a/tests/testpat.cpp
+++ b/tests/testpat.cpp
@@ -2,7 +2,6 @@
 #include <algorithm>
 
 #include "kms++.h"
-#include "testpat.h"
 
 #include "test.h"
 
-- 
cgit v1.2.3