move test.h to libkmstest

diff --git a/tests/test.h b/libkmstest/test.h
similarity index 81%
rename from tests/test.h
rename to libkmstest/test.h
index 090ff38eab013d18b7ebec3ca4c8379e2392e023..0913e79b8058ccc9b3abaaa32a827954e11de370 100644 (file)
--- a/tests/test.h
+++ b/libkmstest/test.h
@@ -1,5 +1,9 @@
 #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,
@@ -13,3 +17,5 @@ static void ASSERT_FAIL(const char *cond, const char *file,
 }
 
 #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 9b7c973f58aedfceea8feace8dcf04bc9a51752d..d70f917fb44596a81948a6af34b92e3cc459041f 100644 (file)
--- 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/testpat.cpp b/tests/testpat.cpp
index 419df5df37a3fd1782187fe9b1ff2b69ba088b72..eaf1091efd7187c349bd72085317a823d4a372e7 100644 (file)
--- a/tests/testpat.cpp
+++ b/tests/testpat.cpp
@@ -2,7 +2,6 @@
 #include <algorithm>
 
 #include "kms++.h"
-#include "testpat.h"
 
 #include "test.h"