Move tests to test/ directory

- Merge the b9test and test directory. - Move js_programs to test/ - Add the b9test executable as a test. Note that all it's test cases are still ifdef'd out. Signed-off-by: Robert Young <[email protected]>
nbhuiyan · Oct 11, 2017 · 410421b · 410421b
1 parent 3042068
commit 410421b
Show file tree

Hide file tree

Showing 9 changed files with 17 additions and 24 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -68,10 +68,6 @@ add_subdirectory(b9)
 
 add_subdirectory(b9run)
 
-add_subdirectory(b9test)
+add_subdirectory(test)
 
 add_subdirectory(third_party)
-
-add_subdirectory(js_programs)
-
-# add_subdirectory(js_compiler)
diff --git a/b9test/CMakeLists.txt b/b9test/CMakeLists.txt
diff --git a/js_programs/CMakeLists.txt b/js_programs/CMakeLists.txt
diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
@@ -1,7 +1,19 @@
-add_library(bench SHARED
-	bench.cpp
+# b9 test - The native test
+
+add_executable(b9test
+	b9test.cpp
 )
 
-add_library(program SHARED
-	program.cpp
+target_link_libraries(b9test
+	PUBLIC
+		b9 gtest_main
 )
+
+add_test(run_b9test b9test)
+
+# Test Programs
+
+add_b9_program(fib)
+add_b9_program(hello)
+add_b9_program(interpreter_test)
+
diff --git a/b9test/b9test.cpp → test/b9test.cpp b/b9test/b9test.cpp → test/b9test.cpp
diff --git a/js_programs/fib.src → test/fib.src b/js_programs/fib.src → test/fib.src
diff --git a/js_programs/hello.src → test/hello.src b/js_programs/hello.src → test/hello.src
diff --git a/b9test/interpreter_test.src → test/interpreter_test.src b/b9test/interpreter_test.src → test/interpreter_test.src
diff --git a/js_programs/test.src → test/test.src b/js_programs/test.src → test/test.src