Merge pull request #49 from lazka/disable-ucrt64-flang

Skip fortran tests for ucrt64+flang
msys2 · Sep 23, 2023 · 1d848f0 · 1d848f0
2 parents 55ebc4d + 2a4caa6
commit 1d848f0
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -16,7 +16,7 @@ jobs:
           { msystem: MINGW64, prefix:  mingw-w64-x86_64, cc: gcc, cxx: g++, fc: gfortran },
           { msystem: MINGW32, prefix:  mingw-w64-i686, cc: gcc, cxx: g++, fc: gfortran },
           { msystem: UCRT64,  prefix:  mingw-w64-ucrt-x86_64, cc: gcc, cxx: g++, fc: gfortran },
-          { msystem: UCRT64,  prefix:  mingw-w64-ucrt-x86_64, cc: clang, cxx: clang++, fc: flang },
+          { msystem: UCRT64,  prefix:  mingw-w64-ucrt-x86_64, cc: clang, cxx: clang++, fc: '' },
           { msystem: CLANG32, prefix:  mingw-w64-clang-i686, cc: clang, cxx: clang++ },
           { msystem: CLANG64, prefix:  mingw-w64-clang-x86_64, cc: clang, cxx: clang++, fc: flang },
           { msystem: MSYS, cc: gcc, cxx: g++, fc: gfortran },

diff --git a/fortran/test.sh b/fortran/test.sh
@@ -7,6 +7,11 @@ if [[ "$MSYSTEM" == "CLANG32" || "$MSYSTEM" == "MSYS" ]]; then
     exit 0;
 fi
 
+if [[ "$MSYSTEM" == "UCRT64" && "$CC" == "clang" ]]; then
+    echo "skipped on $MSYSTEM with clang"
+    exit 0;
+fi
+
 FC="${FC:-gfortran}"
 
 "$FC" hello.f90 -o hello.exe