diff options
Diffstat (limited to 'tests')
| -rwxr-xr-x | tests/run_tests | 10 | ||||
| -rw-r--r-- | tests/tests.cmake | 7 | ||||
| -rw-r--r-- | tests/tests.h | 6 |
3 files changed, 7 insertions, 16 deletions
diff --git a/tests/run_tests b/tests/run_tests deleted file mode 100755 index 4b16a6e..0000000 --- a/tests/run_tests +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/env bash -for i in $(ls -1 tests_*) -do - ./$i; - ret=$?; -if [ $ret -ne 0 ]; -then - exit $ret; -fi -done diff --git a/tests/tests.cmake b/tests/tests.cmake index 56aefe3..5f6c90b 100644 --- a/tests/tests.cmake +++ b/tests/tests.cmake @@ -13,9 +13,9 @@ set(no08 PREFIX=no08 FIXMATH_NO_ROUNDING FIXMATH_OPTIMIZE_8BIT) set(rn08 PREFIX=rn08 FIXMATH_NO_OVERFLOW FIXMATH_OPTIMIZE_8BIT) set(nn08 PREFIX=nn08 FIXMATH_NO_OVERFLOW FIXMATH_NO_ROUNDING FIXMATH_OPTIMIZE_8BIT) -configure_file(tests/run_tests ${CMAKE_BINARY_DIR}/run_tests COPYONLY) +enable_testing() -add_custom_target(tests) +add_custom_target(make_tests) function(create_variant name defs) add_library(libfixmath_${name} STATIC ${libfixmath-srcs}) @@ -24,7 +24,8 @@ function(create_variant name defs) target_link_libraries(tests_${name} PRIVATE libfixmath_${name} m) target_include_directories(tests_${name} PRIVATE ${CMAKE_SOURCE_DIR}) target_compile_definitions(tests_${name} PRIVATE ${defs}) - add_dependencies(tests tests_${name}) + add_dependencies(make_tests tests_${name}) + add_test(NAME tests_${name} COMMAND tests_${name}) endfunction() diff --git a/tests/tests.h b/tests/tests.h index 6be58db..6bd8e4d 100644 --- a/tests/tests.h +++ b/tests/tests.h @@ -21,7 +21,7 @@ extern unsigned stack_depth; { \ fflush(stdout); \ fflush(stderr); \ - fprintf(stdout, \ + fprintf(stderr, \ "\033[31;1m FAILED:\033[22;39m%*s" #x \ " \033[0mat: " __FILE__ ":" STR2(__LINE__) " \n", \ stack_depth, ""); \ @@ -45,7 +45,7 @@ extern unsigned stack_depth; { \ fflush(stdout); \ fflush(stderr); \ - fprintf(stdout, \ + fprintf(stderr, \ "\033[31;1m FAILED:\033[22;39m%*sASSERT_NEAR a: %f, b: " \ "%f, eps: %f\033[0m at: %s(), " __FILE__ \ ":" STR2(__LINE__) "\n", \ @@ -63,7 +63,7 @@ extern unsigned stack_depth; { \ fflush(stdout); \ fflush(stderr); \ - fprintf(stdout, \ + fprintf(stderr, \ "\033[31;1m FAILED:\033[22;39m%*sASSERT_EQ a: %i, b: " \ "%i\033[0m at: %s(), " __FILE__ ":" STR2(__LINE__) "\n", \ stack_depth, "", (a), (b), __func__); \ |