From 27e0be8896a33f5341a3d116207bfaf6c0eb02ac Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rn=20Heusipp?= <manx@openmpt.org>
Date: Sat, 28 Oct 2023 17:06:36 +0000
Subject: [PATCH] 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
---
 build/auto/test-djgpp.sh | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/build/auto/test-djgpp.sh b/build/auto/test-djgpp.sh
index 68406d5553..fa0c2d94a1 100755
--- 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