diff --git a/.github/workflows/c-cpp.yml b/.github/workflows/c-cpp.yml index 69c96f0c..c36bfb52 100644 --- a/.github/workflows/c-cpp.yml +++ b/.github/workflows/c-cpp.yml @@ -185,14 +185,14 @@ jobs: with: name: make msi output - name: Install Wine Mono msi - run: wine64 msiexec /i wine-mono-*.msi 1>&2 + run: wine msiexec /i wine-mono-*.msi 1>&2 - name: Run 64-bit Wine mscoree tests run: | wget -nc 'https://gitlab.winehq.org/wine/wine/-/jobs/artifacts/master/raw/winetest64.exe?job=build-daily-winetest' -O winetest64.exe - wine64 winetest64.exe -x winetest64 >/dev/null - wine64 winetest64/mscoree_test.exe --list 2>/dev/null|sed 's/.$//'|tail -n +2|while read testname; do + wine winetest64.exe -x winetest64 >/dev/null + wine winetest64/mscoree_test.exe --list 2>/dev/null|sed 's/.$//'|tail -n +2|while read testname; do echo BEGIN $testname TEST 1>&2 - WINETEST_REPORT_SUCCESS=1 WINEDEBUG=mscoree WINE_MONO_TRACE=x gtimeout -v 300 wine64 winetest64/mscoree_test.exe $testname 1>&2 || printf 'mscoree:%s 64-bit test failed\n' $testname >> tests-failed + WINETEST_REPORT_SUCCESS=1 WINEDEBUG=mscoree WINE_MONO_TRACE=x gtimeout -v 300 wine winetest64/mscoree_test.exe $testname 1>&2 || printf 'mscoree:%s 64-bit test failed\n' $testname >> tests-failed echo END $testname TEST 1>&2 done if test -f tests-failed; then @@ -202,10 +202,10 @@ jobs: - name: Run 32-bit Wine mscoree tests run: | wget -nc 'https://gitlab.winehq.org/wine/wine/-/jobs/artifacts/master/raw/winetest.exe?job=build-daily-winetest' -O winetest.exe - wine64 winetest.exe -x winetest - wine64 winetest/mscoree_test.exe --list 2>/dev/null|sed 's/.$//'|tail -n +2|while read testname; do + wine winetest.exe -x winetest + wine winetest/mscoree_test.exe --list 2>/dev/null|sed 's/.$//'|tail -n +2|while read testname; do echo BEGIN $testname TEST - WINETEST_REPORT_SUCCESS=1 WINEDEBUG=mscoree WINE_MONO_TRACE=x gtimeout -v 300 wine64 winetest/mscoree_test.exe $testname || printf 'mscoree:%s 32-bit test failed\n' $testname >> tests-failed + WINETEST_REPORT_SUCCESS=1 WINEDEBUG=mscoree WINE_MONO_TRACE=x gtimeout -v 300 wine winetest/mscoree_test.exe $testname || printf 'mscoree:%s 32-bit test failed\n' $testname >> tests-failed echo END $testname TEST done if test -f tests-failed; then @@ -220,4 +220,4 @@ jobs: run: | unzip wine-mono-*-tests.zip 1>&2 wine reg add 'HKCU\Software\Wine\WineDbg' /v ShowCrashDialog /t REG_DWORD /d 0 /f - wine64 tests/run-tests.exe -fail-list:tests/github-wine-failing.txt -fail-list:tests/github-macos-failing.txt + wine tests/run-tests.exe -fail-list:tests/github-wine-failing.txt -fail-list:tests/github-macos-failing.txt