summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter Hutterer <peter.hutterer@who-t.net>2010-04-22 11:18:13 +1000
committerPeter Hutterer <peter.hutterer@who-t.net>2010-06-25 16:16:23 +1000
commitfde1dff26bf796365645750386dbe713146cd9df (patch)
treefb7895a3a15cb5d02775768dc4063d5ca4774834
parentfdeb127e4015a5800cab1b9b7313a78d56866c7b (diff)
Fail if DISPLAY is unset.
All tests require DISPLAY to be set and it is rather annoying when a test runs four hours just to have all the results complain about a missing DISPLAY environment variable. Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
-rw-r--r--xts5/Makefile.am5
1 files changed, 5 insertions, 0 deletions
diff --git a/xts5/Makefile.am b/xts5/Makefile.am
index 5249940c..299c400b 100644
--- a/xts5/Makefile.am
+++ b/xts5/Makefile.am
@@ -38,6 +38,10 @@ XTS_CONFIG = TET_ROOT='$(top_srcdir)' XSET='$(XSET)' XDPYINFO='$(XDPYINFO)' \
tetexec.cfg: tetexec.cfg.in $(srcdir)/bin/xts-config
$(AM_V_GEN)$(XTS_CONFIG) < $< > $@.tmp && mv -f $@.tmp $@ || rm -f $@.tmp
check-local: tetexec.cfg
+ @if test -z "$$DISPLAY"; then \
+ echo "DISPLAY not set"; \
+ exit 1; \
+ fi
@outdir="$(top_builddir)/results/`date +%F-%T`"; \
echo $(run_tcc) -i "$$outdir" xts5 $(scenario); \
$(run_tcc) -i "$$outdir" xts5 $(scenario); \
@@ -46,6 +50,7 @@ check-local: tetexec.cfg
$(report) -f "$$outdir/journal" > "$$outdir/summary"; \
exit $$ret
+
# Helpful pattern target for testing subsets (test-Xopen, etc.)
test-%:
@$(MAKE) $(AM_MAKEFLAGS) check scenario='$*'