Build improvements (improved CMakeLists.txt, added proper support for testing)

9 files changed, 11 insertions, 13 deletions

diff --git a/test/asmjit.h b/test/asmjit.h
deleted file mode 100644
index 36a7588..0000000
--- a/test/asmjit.h
+++ /dev/null
@@ -1 +0,0 @@
-#include "../src/asmjit/asmjit.h"
diff --git a/test/asmjit_bench_x86.cpp b/test/asmjit_bench_x86.cpp
index f3a0e7e..3c95b6c 100644
--- a/test/asmjit_bench_x86.cpp
+++ b/test/asmjit_bench_x86.cpp
@@ -4,10 +4,10 @@
 // [License]
 // Zlib - See LICENSE.md file in the package.
 
+#include <asmjit/x86.h>
 #include <stdio.h>
 #include <string.h>
 
-#include "./asmjit.h"
 #include "./asmjit_test_misc.h"
 #include "./asmjit_test_opcode.h"
 
diff --git a/test/asmjit_test_misc.h b/test/asmjit_test_misc.h
index 5c6824d..5da49f1 100644
--- a/test/asmjit_test_misc.h
+++ b/test/asmjit_test_misc.h
@@ -7,7 +7,7 @@
 #ifndef _ASMJIT_TEST_MISC_H
 #define _ASMJIT_TEST_MISC_H
 
-#include "./asmjit.h"
+#include <asmjit/x86.h>
 
 namespace asmtest {
 
diff --git a/test/asmjit_test_opcode.cpp b/test/asmjit_test_opcode.cpp
index 2de0267..8a1ad5f 100644
--- a/test/asmjit_test_opcode.cpp
+++ b/test/asmjit_test_opcode.cpp
@@ -8,10 +8,10 @@
 // disassembled in your IDE or by your favorite disassembler. Instructions
 // are grouped by category and then sorted alphabetically.
 
+#include <asmjit/x86.h>
 #include <stdio.h>
 #include <stdlib.h>
 
-#include "./asmjit.h"
 #include "./asmjit_test_opcode.h"
 
 using namespace asmjit;
diff --git a/test/asmjit_test_opcode.h b/test/asmjit_test_opcode.h
index c1e89af..93741b7 100644
--- a/test/asmjit_test_opcode.h
+++ b/test/asmjit_test_opcode.h
@@ -7,7 +7,7 @@
 #ifndef _ASMJIT_TEST_OPCODE_H
 #define _ASMJIT_TEST_OPCODE_H
 
-#include "./asmjit.h"
+#include <asmjit/x86.h>
 
 namespace asmtest {
 
diff --git a/test/asmjit_test_unit.cpp b/test/asmjit_test_unit.cpp
index 4f6b82e..13b7665 100644
--- a/test/asmjit_test_unit.cpp
+++ b/test/asmjit_test_unit.cpp
@@ -4,7 +4,8 @@
 // [License]
 // Zlib - See LICENSE.md file in the package.
 
-#include "./asmjit.h"
+#include <asmjit/asmjit.h>
+#include "./broken.h"
 
 using namespace asmjit;
 
diff --git a/test/asmjit_test_x86_asm.cpp b/test/asmjit_test_x86_asm.cpp
index 3f040c8..7108237 100644
--- a/test/asmjit_test_x86_asm.cpp
+++ b/test/asmjit_test_x86_asm.cpp
@@ -4,12 +4,11 @@
 // [License]
 // Zlib - See LICENSE.md file in the package.
 
+#include <asmjit/x86.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 
-#include "./asmjit.h"
-
 using namespace asmjit;
 
 // Signature of the generated function.
diff --git a/test/asmjit_test_x86_cc.cpp b/test/asmjit_test_x86_cc.cpp
index 6617c7d..31d02e6 100644
--- a/test/asmjit_test_x86_cc.cpp
+++ b/test/asmjit_test_x86_cc.cpp
@@ -4,12 +4,12 @@
 // [License]
 // Zlib - See LICENSE.md file in the package.
 
+#include <asmjit/x86.h>
 #include <setjmp.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 
-#include "./asmjit.h"
 #include "./asmjit_test_misc.h"
 
 #ifdef _MSC_VER
diff --git a/test/asmjit_test_x86_sections.cpp b/test/asmjit_test_x86_sections.cpp
index e94742b..7cf74b5 100644
--- a/test/asmjit_test_x86_sections.cpp
+++ b/test/asmjit_test_x86_sections.cpp
@@ -1,4 +1,4 @@
-// [AsmJit]
+// [AsmJit]you want
 // Machine Code Generation for C++.
 //
 // [License]
@@ -13,14 +13,13 @@
 //   - Tell the CodeHolder to resolve unresolved links and check whether
 //     all links were resolved.
 //   - Relocate the code
-//   - Copy the code to the location you want.
+//   - Copy the code to the destination address.
 
+#include <asmjit/x86.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 
-#include "./asmjit.h"
-
 using namespace asmjit;
 
 // The generated function is very simple, it only accesses the built-in data