logo

overlay

My own overlay for experimentations, use with caution, no support is provided git clone https://hacktivis.me/git/overlay.git

portsmf-239-ctest.patch (2740B)

    

  1. From 7f24dac7f55e47667e78b6c5681b44ff2f0d5bff Mon Sep 17 00:00:00 2001
  2. From: "Haelwenn (lanodan) Monnier" <contact@hacktivis.me>
  3. Date: Thu, 26 Aug 2021 04:24:03 +0200
  4. Subject: [PATCH 1/2] CMake: hook up tests to CTest
  6. - test/test.cpp: remove prompt for Enter
  7. - "test" is a reserved name so smftest is used instead
  8. - Remove option for "BUILD_TESTING", CTest provides it, enabled by default
  10. Signed-off-by: Haelwenn (lanodan) Monnier <contact@hacktivis.me>
  11. ---
  12.  CMakeLists.txt      | 2 +-
  13.  test/CMakeLists.txt | 5 +++--
  14.  test/test.cpp       | 2 --
  15.  3 files changed, 4 insertions(+), 5 deletions(-)
  17. diff --git a/CMakeLists.txt b/CMakeLists.txt
  18. index defe5f6..9d306f2 100644
  19. --- a/CMakeLists.txt
  20. +++ b/CMakeLists.txt
  21. @@ -92,7 +92,7 @@ if(BUILD_APPS)
  22.    add_subdirectory(apps)
  23.  endif()
  24.  
  25. -option(BUILD_TESTING "Include test projects" OFF)
  26. +include(CTest)
  27.  if(BUILD_TESTING)
  28.    add_subdirectory(test)
  29.  endif()
  30. diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
  31. index 36f3104..cf989e5 100644
  32. --- a/test/CMakeLists.txt
  33. +++ b/test/CMakeLists.txt
  34. @@ -1,2 +1,3 @@
  35. -add_executable(test test.cpp)
  36. -target_link_libraries(test PortSMF)
  37. +add_executable(smftest test.cpp)
  38. +target_link_libraries(smftest PortSMF)
  39. +add_test(NAME smftest COMMAND smftest)
  40. diff --git a/test/test.cpp b/test/test.cpp
  41. index 3746d72..7553bb5 100644
  42. --- a/test/test.cpp
  43. +++ b/test/test.cpp
  44. @@ -831,6 +831,4 @@ int main()
  45.      //test32();
  46.      printf("*** Test 33 ... DISABLED\n");
  47.      //test33();
  48. -    printf("press enter to exit\n");
  49. -    getchar();
  50.  }
  52. From fa2459efa55bb4afc67457b1c3696fa1fb50bd50 Mon Sep 17 00:00:00 2001
  53. From: "Haelwenn (lanodan) Monnier" <contact@hacktivis.me>
  54. Date: Thu, 26 Aug 2021 04:39:28 +0200
  55. Subject: [PATCH 2/2] Github Workflows: Add CTest
  57. ctest(1) needs to be run into the build directory and doesn't accepts --config
  59. Windows is disabled because Github Workflows seems to be incomplete for CTest,
  60. as seen by the following log line with apparently means a missing DLL:
  62.   1/1 Test #1: smftest ..........................Exit code 0xc0000135
  64. Signed-off-by: Haelwenn (lanodan) Monnier <contact@hacktivis.me>
  65. ---
  66.  .github/workflows/build.yml | 3 +++
  67.  1 file changed, 3 insertions(+)
  69. diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
  70. index 3c5fac5..ddbc397 100644
  71. --- a/.github/workflows/build.yml
  72. +++ b/.github/workflows/build.yml
  73. @@ -34,6 +34,9 @@ jobs:
  74.        run: cmake --build build ${{ matrix.cmake_config }}
  75.        env:
  76.          CMAKE_BUILD_PARALLEL_LEVEL: 2
  77. +    - name: Test
  78. +      if: ${{ runner.os != 'Windows' }}
  79. +      run: cd build && ctest --build-config RelWithDebInfo --output-on-failure && cd ..
  80.      - name: Install
  81.        run: cmake --install . ${{ matrix.cmake_config }}
  82.        working-directory: build