Merge branch 'next' into master

[i3/i3] / travis / run-tests.sh

diff --git a/travis/run-tests.sh b/travis/run-tests.sh
index 44df81d2ffbdf257fdb0c428999290c56c711db5..eac2ea8a37715f340f27e17969419ff55bceb4b0 100755 (executable)
--- a/travis/run-tests.sh
+++ b/travis/run-tests.sh
@@ -26,7 +26,7 @@ fi
 
 # Try running the tests in parallel so that the common case (tests pass) is
 # quick, but fall back to running them in sequence to make debugging easier.
-if ! xvfb-run make check
+if ! make check
 then
-       xvfb-run ./testcases/complete-run.pl --parallel=1 || (cat latest/complete-run.log; false)
+       ./testcases/complete-run.pl --parallel=1 || (cat latest/complete-run.log; false)
 fi