Merged revision(s) 19897-19898 from trunk/OpenMPT:

[Fix] test: Wait 5 seconds after Xvfb startup when running DJGPP tests in DOSBox. ........ [Ref] Test: Use xvfb-run for DJGPP/DOSBox tests. ........ git-svn-id: https://source.openmpt.org/svn/openmpt/branches/OpenMPT-1.31@19899 56274372-70c3-4bfc-bfc3-4c3a0b034d27
OpenMPT · Oct 28, 2023 · 27e0be8 · 27e0be8
1 parent c07f48c
commit 27e0be8
Showing 1 changed file with 1 addition and 7 deletions.
diff --git a/build/auto/test-djgpp.sh b/build/auto/test-djgpp.sh
@@ -10,13 +10,7 @@ cp test/test.mptm test/test.mpt
 
 echo "BIN\\TEST.EXE >BIN\\TEST.LOG" > test.bat
 
-Xvfb :100 -ac &
-export DISPLAY=:100
-
-dosbox -exit test.bat
-
-kill %1
-wait
+xvfb-run -a dosbox -exit test.bat
 
 rm test.bat