[beast: 15/17] BUILD: Makefile.decl: add x11tests (X11TESTS) for taptests inside xvfb

[Tim Janik <timj src gnome org>]

commit adbe148ed2d2acb9197da437e9301b1c26b3d74f
Author: Tim Janik <timj gnu org>
Date:   Fri Nov 20 17:39:23 2015 +0100

    BUILD: Makefile.decl: add x11tests (X11TESTS) for taptests inside xvfb
    
    Signed-off-by: Tim Janik <timj gnu org>

 Makefile.decl |   29 ++++++++++++++++++++---------
 1 files changed, 20 insertions(+), 9 deletions(-)
---
diff --git a/Makefile.decl b/Makefile.decl
index 1875aae..2e24be0 100644
--- a/Makefile.decl
+++ b/Makefile.decl
@@ -1,4 +1,4 @@
-# BEAST & BSE
+# BEAST & BSE                                          -*-mode:makefile;-*-
 
 # declare variables that we might want to use += on.
 EXTRA_HEADERS=
@@ -67,15 +67,26 @@ endif
 
 # == TAPTESTS ==
 # tests run through taptool.sh
-TAPTESTS     =
-TAPTEST_RUNS = $(addsuffix .taprun, $(basename $(TAPTESTS)))
-.PHONY: tcheck $(TAPTEST_RUNS)
-tcheck: $(top_srcdir)/taptool.sh
-       $(MAKE) $(AM_MAKEFLAGS) --no-print-directory $(TAPTEST_RUNS)
-$(TAPTEST_RUNS): %.taprun: % # static pattern rule - also works for phony targets
+TAPTESTS =
+TAPRUNS  = $(addsuffix .taprun, $(basename $(TAPTESTS)))
+.PHONY: taptests $(TAPRUNS)
+taptests: $(top_srcdir)/taptool.sh
+       @$(MAKE) $(AM_MAKEFLAGS) --no-print-directory $(TAPRUNS)
+$(TAPRUNS): %.taprun: % # static pattern rule - also works for phony targets
        $(Q) test "$@" = "$(@F)" || { echo "$@: test program outside CWD" >&2; exit 1; }
        $(Q) TST="$(@:%.taprun=%)"; $(top_srcdir)/taptool.sh --test-name "$$TST" -- ./"$$TST"
-check: tcheck
+check: taptests
+
+# == X11TESTS ==
+X11TESTS =
+X11RUNS  = $(addsuffix .x11run, $(basename $(X11TESTS)))
+.PHONY: x11tests $(X11RUNS)
+x11tests: $(top_srcdir)/taptool.sh
+       @$(MAKE) $(AM_MAKEFLAGS) --no-print-directory $(X11RUNS)
+$(X11RUNS): %.x11run: % # static pattern rule - also works for phony targets
+       $(Q) test "$@" = "$(@F)" || { echo "$@: test program outside CWD" >&2; exit 1; }
+       $(Q) TST="$(@:%.x11run=%)"; $(X11_ENV) $(top_srcdir)/taptool.sh --test-name "$$TST" -- ./"$$TST"
+check: x11tests
 
 # === slowcheck ===
 # recursive rule supported by all Makefiles to run time consuming checks
@@ -118,7 +129,7 @@ perf-PERFTESTS:
 PERFTESTS=
 
 # === ALLTESTS ===
-ALLTESTS = $(TESTS) $(TAPTESTS) $(SLOWTESTS) $(PERFTESTS) # used in noinst_PROGRAMS
+ALLTESTS = $(TESTS) $(TAPTESTS) $(X11TESTS) $(SLOWTESTS) $(PERFTESTS) # used in noinst_PROGRAMS
 
 # === report ===
 .PHONY: report