ci: make app test more robust

scivision · Nov 28, 2024 · 14dd92e · 14dd92e
1 parent 5dfe6eb
commit 14dd92e
Show file tree

Hide file tree

Showing 6 changed files with 16 additions and 38 deletions.
diff --git a/.github/workflows/ci_windows.yml b/.github/workflows/ci_windows.yml
@@ -55,7 +55,7 @@ jobs:
     - name: example test
       run: ctest --test-dir example/build -C Release -V
 
-  windows-gcc:
+  msys2:
     runs-on: windows-latest
     timeout-minutes: 10
 

diff --git a/app/fortran/main.f90 b/app/fortran/main.f90
@@ -20,6 +20,8 @@ program repl
 
 if(is_admin()) write(stderr, '(a)') "WARNING: running as admin / sudo"
 
+print '(a)', "Backend: " // backend()
+
 main : do
   write(stdout, "(a)", advance="no") "Ffs> "
 

diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
@@ -1,16 +1,16 @@
 include(CheckIncludeFile)
 
 if(HAVE_CXX_FILESYSTEM)
-  set(_regex "Ffs> <filesystem>")
+  set(_regex "Backend: <filesystem>")
 else()
-  set(_regex "Ffs> C")
+  set(_regex "Backend: C")
 endif()
 
+
 if(TARGET filesystem_cli)
 
 add_test(NAME Fortran_CLI
-COMMAND ${CMAKE_COMMAND} -Dexe=$<TARGET_FILE:filesystem_cli>
--P ${CMAKE_CURRENT_SOURCE_DIR}/stdin.cmake
+COMMAND ${CMAKE_COMMAND} -Dexe=$<TARGET_FILE:filesystem_cli> -P ${CMAKE_CURRENT_SOURCE_DIR}/stdin_nul.cmake
 )
 set_tests_properties(Fortran_CLI PROPERTIES
 LABELS "Fortran"
@@ -19,22 +19,17 @@ PASS_REGULAR_EXPRESSION ${_regex}
 
 endif()
 
-if(TARGET fs_cli)
 
-  if(HAVE_CXX_FILESYSTEM)
-    set(_regex "Backend: <filesystem>")
-  else()
-    set(_regex "Backend: C")
-  endif()
+if(TARGET fs_cli)
 
-  add_test(NAME Cpp_CLI
-  COMMAND ${CMAKE_COMMAND} -Dexe=$<TARGET_FILE:fs_cli> -P ${CMAKE_CURRENT_SOURCE_DIR}/stdin_nul.cmake
-  )
+add_test(NAME Cpp_CLI
+COMMAND ${CMAKE_COMMAND} -Dexe=$<TARGET_FILE:fs_cli> -P ${CMAKE_CURRENT_SOURCE_DIR}/stdin_nul.cmake
+)
 
-  set_tests_properties(Cpp_CLI PROPERTIES
-  LABELS "Cpp"
-  PASS_REGULAR_EXPRESSION ${_regex}
-  )
+set_tests_properties(Cpp_CLI PROPERTIES
+LABELS "Cpp"
+PASS_REGULAR_EXPRESSION ${_regex}
+)
 
 endif()
 

diff --git a/test/core/test_absolute.cpp b/test/core/test_absolute.cpp
@@ -23,7 +23,7 @@ std::string in = "rel";
 std::string base, ref, out;
 const std::string cwd = fs_get_cwd();
 
-const bool needs_normal = fs_is_windows() && fs_backend() == "<filesystem>" && fs_compiler().substr(0, 5) != "Clang";
+const bool needs_normal = fs_is_windows() && fs_backend() == "<filesystem>";
 
 int err = 0;
 

diff --git a/test/repl_cpp.txt b/test/repl_cpp.txt
diff --git a/test/stdin.cmake b/test/stdin.cmake