From feb9aaf22ffba6a238d572c2b89d60ab9ccbd835 Mon Sep 17 00:00:00 2001 From: Mitya Selivanov <0x7fffff@guattari.ru> Date: Fri, 19 Aug 2022 16:38:45 +0400 Subject: test win32 --- .github/workflows/build_and_test.yml | 2 +- CMakeLists.txt | 14 +++++----- source/kit_test/test.c | 3 ++ source/test/programs/CMakeLists.txt | 54 ++++++++++++++++++------------------ 4 files changed, 38 insertions(+), 35 deletions(-) diff --git a/.github/workflows/build_and_test.yml b/.github/workflows/build_and_test.yml index 6f29517..74501aa 100644 --- a/.github/workflows/build_and_test.yml +++ b/.github/workflows/build_and_test.yml @@ -16,7 +16,7 @@ jobs: build: strategy: matrix: - os: [ ubuntu-latest, macos-latest, windows-2019 ] + os: [ windows-2019 ] runs-on: ${{ matrix.os }} diff --git a/CMakeLists.txt b/CMakeLists.txt index 2ca6ce3..573cbdf 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -141,13 +141,13 @@ if(KIT_ENABLE_TESTING) --coverage) endif() - add_test( - NAME ${KIT_LIBRARY}_unittests - COMMAND ${KIT_TEST_SUITE} --no-carriage-return) - set_tests_properties( - ${KIT_LIBRARY}_unittests - PROPERTIES - TIMEOUT "120") + #add_test( + # NAME ${KIT_LIBRARY}_unittests + # COMMAND ${KIT_TEST_SUITE} --no-carriage-return) + #set_tests_properties( + # ${KIT_LIBRARY}_unittests + # PROPERTIES + # TIMEOUT "120") endif() add_subdirectory(source) diff --git a/source/kit_test/test.c b/source/kit_test/test.c index ce3a93b..421a459 100644 --- a/source/kit_test/test.c +++ b/source/kit_test/test.c @@ -101,6 +101,7 @@ static int run_test(volatile int i) { } int kit_run_tests(int argc, char **argv) { + printf(" %% setup_signals\n\n"); setup_signals(); int success_count = 0; @@ -111,6 +112,7 @@ int kit_run_tests(int argc, char **argv) { int term_color = 1; int carriage_return = 1; + printf(" %% parse cmd args\n\n"); for (int i = 0; i < argc; i++) if (strcmp("--no-term-color", argv[i]) == 0) term_color = 0; @@ -122,6 +124,7 @@ int kit_run_tests(int argc, char **argv) { if (quiet) term_color = 0; + printf(" %% testing loop\n\n"); for (int i = 0; i < kit_tests_list.size && i < KIT_TESTS_SIZE_LIMIT; i++) { color_code(term_color, yellow); diff --git a/source/test/programs/CMakeLists.txt b/source/test/programs/CMakeLists.txt index eea6d87..d6c7968 100644 --- a/source/test/programs/CMakeLists.txt +++ b/source/test/programs/CMakeLists.txt @@ -1,33 +1,33 @@ if(KIT_ENABLE_TESTING) - add_executable(too_many_tests too_many_tests.c) - target_link_libraries(too_many_tests ${KIT_TEST_LIBRARY}) - add_test( - NAME too_many_tests_test - COMMAND too_many_tests --quiet) - set_tests_properties( - too_many_tests_test - PROPERTIES - TIMEOUT "15") + #add_executable(too_many_tests too_many_tests.c) + #target_link_libraries(too_many_tests ${KIT_TEST_LIBRARY}) + #add_test( + # NAME too_many_tests_test + # COMMAND too_many_tests --quiet) + #set_tests_properties( + # too_many_tests_test + # PROPERTIES + # TIMEOUT "15") - add_executable(too_many_assertions too_many_assertions.c) - target_link_libraries(too_many_assertions ${KIT_TEST_LIBRARY}) - add_test( - NAME too_many_assertions_test - COMMAND too_many_assertions --quiet) - set_tests_properties( - too_many_assertions_test - PROPERTIES - TIMEOUT "15") + #add_executable(too_many_assertions too_many_assertions.c) + #target_link_libraries(too_many_assertions ${KIT_TEST_LIBRARY}) + #add_test( + # NAME too_many_assertions_test + # COMMAND too_many_assertions --quiet) + #set_tests_properties( + # too_many_assertions_test + # PROPERTIES + # TIMEOUT "15") - add_executable(cpp_example cpp_example.cpp) - target_link_libraries(cpp_example ${KIT_TEST_LIBRARY}) - add_test( - NAME cpp_example_test - COMMAND cpp_example --quiet) - set_tests_properties( - cpp_example_test - PROPERTIES - TIMEOUT "15") + #add_executable(cpp_example cpp_example.cpp) + #target_link_libraries(cpp_example ${KIT_TEST_LIBRARY}) + #add_test( + # NAME cpp_example_test + # COMMAND cpp_example --quiet) + #set_tests_properties( + # cpp_example_test + # PROPERTIES + # TIMEOUT "15") add_executable(signals signals.c) target_link_libraries(signals ${KIT_TEST_LIBRARY}) -- cgit v1.2.3