From c77756c48d6f38c8b40a39fd53f610c296530adf Mon Sep 17 00:00:00 2001 From: Tomi Valkeinen Date: Thu, 1 Oct 2015 21:49:43 +0300 Subject: [PATCH] move test.h to libkmstest --- {tests => libkmstest}/test.h | 6 ++++++ tests/db.cpp | 3 --- tests/testpat.cpp | 1 - 3 files changed, 6 insertions(+), 4 deletions(-) rename {tests => libkmstest}/test.h (81%) diff --git a/tests/test.h b/libkmstest/test.h similarity index 81% rename from tests/test.h rename to libkmstest/test.h index 090ff38..0913e79 100644 --- 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 9b7c973..d70f917 100644 --- a/tests/db.cpp +++ b/tests/db.cpp @@ -6,7 +6,6 @@ #include #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 419df5d..eaf1091 100644 --- a/tests/testpat.cpp +++ b/tests/testpat.cpp @@ -2,7 +2,6 @@ #include #include "kms++.h" -#include "testpat.h" #include "test.h" -- 2.26.2