.gitlab-ci.yml msys2/build.sh test-log test-png test-shell

[GitLab Mirror]

 .gitlab-ci.yml |    4 ++--
 msys2/build.sh |    2 ++
 test-log       |    4 +++-
 test-png       |    2 +-
 test-shell     |    4 +++-
 5 files changed, 11 insertions(+), 5 deletions(-)

New commits:
commit 9c573c97545db8a58f1cc115f40073ea493bb356
Author: Frediano Ziglio <freddy77 at gmail.com>
Date:   Tue Mar 4 09:15:43 2025 +0000

    Execute tests for MSYS2 build
    
    Avoid to run executables using Wine if system is not Linux.
    Use relative paths for executables as bash otherwise won't find them.
    Make build.sh script fail on intermediate errors.
    
    Signed-off-by: Frediano Ziglio <freddy77 at gmail.com>

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 30ac855..8a1bd51 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -15,8 +15,8 @@ fedora-mingw:
   script:
   - mingw64-configure
   - mingw64-make
-  - mingw64-make check
+  - mingw64-make check || { cat test-suite.log ; exit 1; }
   - make distclean
   - mingw32-configure
   - mingw32-make
-  - mingw32-make check
+  - mingw32-make check || { cat test-suite.log ; exit 1; }
diff --git a/msys2/build.sh b/msys2/build.sh
index 04f0ddf..1503442 100644
--- a/msys2/build.sh
+++ b/msys2/build.sh
@@ -1,6 +1,8 @@
 #!/bin/bash
 
+set -ex
 mkdir $1
 cd $1
 ../configure
 make -j$(nproc) msi
+make check || { cat test-suite.log ; exit 1; }
diff --git a/test-log b/test-log
index 4ba2efe..df49018 100755
--- a/test-log
+++ b/test-log
@@ -1,3 +1,5 @@
 #!/bin/bash
 
-exec wine test-log-win.exe
+WINE=wine
+[ "x`uname -s`" = xLinux ] || WINE=
+exec $WINE ./test-log-win.exe
diff --git a/test-png b/test-png
index 57fa27e..ea93286 100755
--- a/test-png
+++ b/test-png
@@ -28,7 +28,7 @@ if [ "x`uname -s`" != xLinux ]; then
 fi
 
 # MSVC build put executables under <Configuration> directory
-IMAGETEST=imagetest.exe
+IMAGETEST=./imagetest.exe
 if [ -e ./Release/imagetest.exe ]; then
     IMAGETEST=./Release/imagetest.exe
 fi
diff --git a/test-shell b/test-shell
index 3f286f1..ce0bbc9 100755
--- a/test-shell
+++ b/test-shell
@@ -1,3 +1,5 @@
 #!/bin/bash
 
-exec wine test-shell-win.exe
+WINE=wine
+[ "x`uname -s`" = xLinux ] || WINE=
+exec $WINE ./test-shell-win.exe