From 858d7982fba21ff087c8fb75f310670e3723f2ae Mon Sep 17 00:00:00 2001 From: Nick Wellnhofer Date: Wed, 31 Dec 2014 16:22:35 +0100 Subject: Fix API test on Windows set_tests_properties must not be called before adding the test. --- test/CMakeLists.txt | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'test') diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt index f08b325..3d90b38 100644 --- a/test/CMakeLists.txt +++ b/test/CMakeLists.txt @@ -3,13 +3,6 @@ find_package(PythonInterp 3 REQUIRED) set(PYTHON ${PYTHON_EXECUTABLE}) -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(html_normalization ${PYTHON} "-m" "doctest" "${CMAKE_CURRENT_SOURCE_DIR}/normalize.py" @@ -27,6 +20,13 @@ add_test(pathological_tests_library 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_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 +) -- cgit v1.2.3