From 424d99a42589f54fcec217bd3b199619b24ae452 Mon Sep 17 00:00:00 2001 From: Esme Povirk Date: Sat, 14 Oct 2023 15:14:19 -0500 Subject: [PATCH] GNUmakefile: Fix test target in current Wine. --- .gitignore | 1 + GNUmakefile | 4 +++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index d9fd90a1..07affefb 100644 --- a/.gitignore +++ b/.gitignore @@ -22,3 +22,4 @@ /System.Speech/src/ExceptionStringTable.resources /System.Speech/src/System.Speech.dll /System.Speech/src/embeddedresources.flags +/test-output.txt diff --git a/GNUmakefile b/GNUmakefile index 94076858..b41ce5d5 100644 --- a/GNUmakefile +++ b/GNUmakefile @@ -221,7 +221,9 @@ clean: clean-tests test: tests image WINEPREFIX=$(BUILDDIR_ABS)/.wine-test-prefix $(WINE) reg add 'HKCU\Software\Wine\WineDbg' /v ShowCrashDialog /t REG_DWORD /d 0 /f WINEPREFIX=$(BUILDDIR_ABS)/.wine-test-prefix $(MAKE) dev-setup - WINEPREFIX=$(BUILDDIR_ABS)/.wine-test-prefix $(WINE) explorer /desktop=wine-mono-test '$(shell $(WINE) winepath -w $(TESTS_OUTDIR)/run-tests.exe)' + $(RM_F) test-output.txt + WINEPREFIX=$(BUILDDIR_ABS)/.wine-test-prefix $(WINE) explorer /desktop=wine-mono-test cmd /c '$(shell $(WINE) winepath -w $(TESTS_OUTDIR)/run-tests.exe) >test-output.txt 2>&1' + ! grep -q 'The following tests failed but were not in fail-list:' test-output.txt clean-build-test-prefix: -WINEPREFIX=$(BUILDDIR_ABS)/.wine-test-prefix wineserver -k