Update MSVC & MSYS1 CI

.github/workflows/windows-msvc.yml

@@ -156,6 +156,26 @@ jobs:
         run: |
           pacman --needed --noconfirm -S $MSYSPKGS
 
+      - name: Adjust testsuite
+        shell: C:\shells\msys2bash.cmd {0}
+        run: |
+          cd tests
+          sed -i '/AT_SETUP(\[runtime check: write to internal storage (1)\])/a AT_SKIP_IF(\[true\])' testsuite.src/run_misc.at
+
+      - name: Adjust testsuite for Debug target
+        if: ${{ matrix.target == 'Debug' }}
+        shell: C:\shells\msys2bash.cmd {0}
+        run: |
+          cd tests
+          sed -i '/AT_SETUP(\[ASSIGN DYNAMIC with data item in LINKAGE\])/a AT_SKIP_IF(\[true\])' testsuite.src/run_file.at
+          sed -i '/AT_SETUP(\[SEQUENTIAL basic I\/O\])/a AT_SKIP_IF(\[true\])' testsuite.src/run_file.at
+          sed -i '/AT_SETUP(\[EXTERNAL RELATIVE file])/a AT_SKIP_IF(\[true\])' testsuite.src/run_file.at
+          sed -i '/AT_SETUP(\[LINE SEQUENTIAL one Record])/a AT_SKIP_IF(\[true\])' testsuite.src/run_file.at
+          sed -i '/AT_SETUP(\[Concatenated Files])/a AT_SKIP_IF(\[true\])' testsuite.src/run_file.at
+          sed -i '/AT_SETUP(\[FUNCTION RANDOM])/a AT_SKIP_IF(\[true\])' testsuite.src/run_functions.at
+
+# The tests in sed commands above randomly hang (under debug configurations)
+
       - name: Build testsuite
         shell: C:\shells\msys2bash.cmd {0}
         run: |
@@ -175,19 +195,8 @@ jobs:
           echo m4_define\([AT_PACKAGE_STRING], [$GC_VERSION]\) > package.m4
           echo m4_define\([AT_PACKAGE_BUGREPORT], [[email protected]]\) >> package.m4
           sed 's/x64\/Debug/${{ env.ARCHDIR }}\/${{ matrix.target }}/g' atlocal_win > atlocal
-          sed -i '/AT_SETUP(\[runtime check: write to internal storage (1)\])/a AT_SKIP_IF(\[true\])' testsuite.src/run_misc.at
-
-          sed -i '/AT_SETUP(\[ASSIGN DYNAMIC with data item in LINKAGE\])/a AT_SKIP_IF(\[true\])' testsuite.src/run_file.at
-          sed -i '/AT_SETUP(\[SEQUENTIAL basic I\/O\])/a AT_SKIP_IF(\[true\])' testsuite.src/run_file.at
-          sed -i '/AT_SETUP(\[EXTERNAL RELATIVE file])/a AT_SKIP_IF(\[true\])' testsuite.src/run_file.at
-          sed -i '/AT_SETUP(\[LINE SEQUENTIAL one Record])/a AT_SKIP_IF(\[true\])' testsuite.src/run_file.at
-          sed -i '/AT_SETUP(\[Concatenated Files])/a AT_SKIP_IF(\[true\])' testsuite.src/run_file.at
-          sed -i '/AT_SETUP(\[FUNCTION RANDOM])/a AT_SKIP_IF(\[true\])' testsuite.src/run_functions.at
-
           autom4te --lang=autotest -I ./testsuite.src ./testsuite.at -o ./testsuite
 
-# The tests in sed commands above randomly hang (under debug configurations)
-
       - name: Run testsuite
         continue-on-error: true
         run: |

.github/workflows/windows-msys1.yml

@@ -175,7 +175,7 @@ jobs:
           sed -i 'N;s/else/else :;/g' .\configure
           sed -i 's/\} else \:;/} else/g' .\configure
           sed -i 's/#else \:;/#else/g' .\configure
-          bash -lc "cd _build && ../configure %CFGOPT% --with-db --with-indexed=db --prefix=/opt/cobol/gnucobol"
+          bash -lc "cd _build && CFLAGS=\"-I ../libcob\" ../configure %CFGOPT% --with-db --with-indexed=db --prefix=/opt/cobol/gnucobol"
 
       - name: Upload config-${{ matrix.target }}.log
         uses: actions/upload-artifact@v4
@@ -204,7 +204,7 @@ jobs:
       - name: Run testsuite
         continue-on-error: true
         run: |
-          sed -i '/AT_SETUP(\[temporary path invalid\])/a AT_SKIP_IF(\[true\])' .\tests\testsuite.src\used_binaries.at
+          sed -i '/AT_SETUP(\[temporary path invalid\])/a AT_SKIP_IF(\[true\])' tests/testsuite.src/used_binaries.at
           bash -lc "cd _build/tests && CPATH=/opt/cobol/gnucobol/include make check TESTSUITEFLAGS=\"--jobs=$(($(nproc)+1))\""
 
 # Note: the extra CPATH above is only required in debug builds, for some reason...

.github/workflows/windows-msys2.yml

@@ -103,11 +103,6 @@ jobs:
           make check
           make test
 
-#          make check TESTSUITEFLAGS="--jobs=$(($(nproc)+1))"
-# also randomly in release
-# FUNCTION PI
-# FUNCTION RANDOM
-
       - name: Upload testsuite-${{ matrix.target }}.log
         uses: actions/upload-artifact@v4
         with: