From f4aff860e735b389a3dbbdd24b3cdd50399df0b6 Mon Sep 17 00:00:00 2001
From: umarcor <unai.martinezcorral@ehu.eus>
Date: Mon, 30 Nov 2020 08:13:53 +0100
Subject: [PATCH] ci/win: remove 'mingw64' from 'test.sh'

---
 .github/test.sh            | 10 ++++++----
 .github/workflows/test.yml | 10 +++-------
 2 files changed, 9 insertions(+), 11 deletions(-)
 mode change 100644 => 100755 .github/test.sh

diff --git a/.github/test.sh b/.github/test.sh
old mode 100644
new mode 100755
index 92fe67077..cb9e7c983
--- a/.github/test.sh
+++ b/.github/test.sh
@@ -1,13 +1,15 @@
+#!/usr/bin/env sh
+
 git clone https://github.com/steveicarus/ivtest.git
 cd ivtest
 
 if [ "$OS" = 'Windows_NT' ]; then
-  $mingw64 perl update_msys2_report.pl
-  $mingw64 perl vvp_reg.pl
+  perl update_msys2_report.pl
+  perl vvp_reg.pl
   diff --strip-trailing-cr regression_report-msys2.txt regression_report.txt
-  $mingw64 perl vpi_reg.pl
 else
   perl vvp_reg.pl
   diff regression_report-devel.txt regression_report.txt
-  perl vpi_reg.pl
 fi
+
+perl vpi_reg.pl
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index cc6f57438..b62d8df78 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -35,7 +35,7 @@ jobs:
         make check
 
     - name: Test
-      run: sh .github/test.sh
+      run: ./.github/test.sh
 
 
   win:
@@ -59,15 +59,11 @@ jobs:
     - name: Build and test
       shell: bash
       run: |
-        export msys2='cmd //C RefreshEnv.cmd '
-        export msys2+='& set MSYS=winsymlinks:nativestrict '
-        export msys2+='& C:\\msys64\\msys2_shell.cmd -defterm -no-start'
-        export mingw64="$msys2 -mingw64 -full-path -here -c "\"\$@"\" --"
-        export msys2+=" -msys2 -c "\"\$@"\" --"
+        export mingw64='cmd //C RefreshEnv.cmd & set MSYS=winsymlinks:nativestrict & C:\\msys64\\msys2_shell.cmd -defterm -no-start -mingw64 -full-path -here -c "$@" --'
 
         $mingw64 ./autoconf.sh
         $mingw64 ./configure
         $mingw64 make install
         $mingw64 make check
 
-        sh .github/test.sh
+        $mingw64 ./.github/test.sh