GNUmakefile: Fix test target in current Wine.

madewokherd · Oct 14, 2023 · 424d99a · 424d99a
1 parent 8aaa432
commit 424d99a
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git 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
@@ -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