diff options
| -rw-r--r-- | .gitlab-ci.yml | 4 | ||||
| -rw-r--r-- | msys2/build.sh | 2 | ||||
| -rwxr-xr-x | test-log | 4 | ||||
| -rwxr-xr-x | test-png | 2 | ||||
| -rwxr-xr-x | test-shell | 4 |
5 files changed, 11 insertions, 5 deletions
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; } @@ -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 @@ -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 @@ -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 |