aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--CMakeLists.txt22
-rw-r--r--test/CMakeLists.txt24
-rw-r--r--test/pathological_tests.py (renamed from pathological_tests.py)0
-rwxr-xr-xtest/spec_tests.py (renamed from spec_tests.py)0
4 files changed, 25 insertions, 21 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 2e4c870..be75c5e 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -15,28 +15,8 @@ set(PROJECT_VERSION ${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}.${PROJECT_
add_subdirectory(src)
add_subdirectory(api_test)
add_subdirectory(man)
-
enable_testing()
-
-# To get verbose output: cmake --build build --target "test" -- ARGS='-V'
-add_test(spectest_library
- python "${CMAKE_SOURCE_DIR}/spec_tests.py" "--no-normalize" "--spec"
- "${CMAKE_SOURCE_DIR}/spec.txt" "--library-dir" "${CMAKE_BINARY_DIR}/src"
-)
-add_test(pathological_tests_library
- python "${CMAKE_SOURCE_DIR}/pathological_tests.py"
- "--library-dir" "${CMAKE_BINARY_DIR}/src"
-)
-add_test(NAME api_test COMMAND api_test)
-if (WIN32)
- file(TO_NATIVE_PATH ${CMAKE_BINARY_DIR}/src WIN_DLL_DIR)
- set_tests_properties(api_test PROPERTIES
- ENVIRONMENT "PATH=${WIN_DLL_DIR};$ENV{PATH}"
- )
-endif(WIN32)
-add_test(spectest_executable
- python "${CMAKE_SOURCE_DIR}/spec_tests.py" "--no-normalize" "--spec" "${CMAKE_SOURCE_DIR}/spec.txt" "--program" "${CMAKE_BINARY_DIR}/src/cmark"
-)
+add_subdirectory(test)
if(NOT CMAKE_BUILD_TYPE)
set(CMAKE_BUILD_TYPE "Release" CACHE STRING
diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
new file mode 100644
index 0000000..6761317
--- /dev/null
+++ b/test/CMakeLists.txt
@@ -0,0 +1,24 @@
+# To get verbose output: cmake --build build --target "test" -- ARGS='-V'
+
+if (WIN32)
+ file(TO_NATIVE_PATH ${CMAKE_BINARY_DIR}/src WIN_DLL_DIR)
+ set_tests_properties(api_test PROPERTIES
+ ENVIRONMENT "PATH=${WIN_DLL_DIR};$ENV{PATH}"
+ )
+endif(WIN32)
+
+add_test(spectest_library
+ python "${CMAKE_CURRENT_SOURCE_DIR}/spec_tests.py" "--no-normalize" "--spec"
+ "${CMAKE_SOURCE_DIR}/spec.txt" "--library-dir" "${CMAKE_BINARY_DIR}/src"
+)
+
+add_test(pathological_tests_library
+ python "${CMAKE_CURRENT_SOURCE_DIR}/pathological_tests.py"
+ "--library-dir" "${CMAKE_BINARY_DIR}/src"
+)
+
+add_test(NAME api_test COMMAND api_test)
+
+add_test(spectest_executable
+ python "${CMAKE_CURRENT_SOURCE_DIR}/spec_tests.py" "--no-normalize" "--spec" "${CMAKE_SOURCE_DIR}/spec.txt" "--program" "${CMAKE_BINARY_DIR}/src/cmark"
+) \ No newline at end of file
diff --git a/pathological_tests.py b/test/pathological_tests.py
index 999a467..999a467 100644
--- a/pathological_tests.py
+++ b/test/pathological_tests.py
diff --git a/spec_tests.py b/test/spec_tests.py
index 6e0d4cc..6e0d4cc 100755
--- a/spec_tests.py
+++ b/test/spec_tests.py