Merge pull request #3497 from stapelberg/clang-format

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

diff --git a/travis/run-tests.sh b/travis/run-tests.sh
index 3ab3df4d99e4c3c86afc5ad57ca3100598eabd51..eac2ea8a37715f340f27e17969419ff55bceb4b0 100755 (executable)
--- a/travis/run-tests.sh
+++ b/travis/run-tests.sh
@@ -3,10 +3,30 @@
 set -e
 set -x
 
-cd testcases
+cd build
+
+# TODO: remove this workaround once https://bugs.debian.org/836723 is fixed
+# Found at https://llvm.org/bugs/show_bug.cgi?id=27310#c8:
+if [ "$CC" = "clang" ]
+then
+       cat >fixasan.c <<EOT
+void __isoc99_printf() {}
+void __isoc99_sprintf() {}
+void __isoc99_snprintf() {}
+void __isoc99_fprintf() {}
+void __isoc99_vprintf() {}
+void __isoc99_vsprintf() {}
+void __isoc99_vsnprintf() {}
+void __isoc99_vfprintf() {}
+void __cxa_throw() {} // NEW
+EOT
+       gcc fixasan.c -o fixasan.so -fPIC -shared -nostdlib
+       export LD_PRELOAD=$PWD/fixasan.so
+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 ./complete-run.pl
+if ! make check
 then
-       xvfb-run ./complete-run.pl --parallel=1 || (cat latest/complete-run.log; false)
+       ./testcases/complete-run.pl --parallel=1 || (cat latest/complete-run.log; false)
 fi