/hg/icedtea6: Use xvfb-run if available and DISPLAY not set for ...

[mjw at icedtea.classpath.org]

changeset 6633b7a3a5db in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=6633b7a3a5db
author: Mark Wielaard <mark at klomp.org>
date: Sat Jan 22 21:47:34 2011 +0100

	Use xvfb-run if available and DISPLAY not set for check-jdk.

	* configure.ac: Add xvfb-run AC_CHECK_PROG.
	* Makefile.am (check-jdk): Use xvfb-run if available and DISPLAY not
	set.


diffstat:

3 files changed, 15 insertions(+)
ChangeLog    |    6 ++++++
Makefile.am  |    5 +++++
configure.ac |    4 ++++

diffs (42 lines):

diff -r d850506bcaac -r 6633b7a3a5db ChangeLog
--- a/ChangeLog	Sat Jan 22 20:39:36 2011 +0100
+++ b/ChangeLog	Sat Jan 22 21:47:34 2011 +0100
@@ -1,3 +1,9 @@ 2010-01-22  Mark Wielaard  <mark at klomp.o
+2010-01-22  Mark Wielaard  <mark at klomp.org>
+
+	* configure.ac: Add xvfb-run AC_CHECK_PROG.
+	* Makefile.am (check-jdk): Use xvfb-run if available and DISPLAY
+	not set.
+
 2010-01-22  Mark Wielaard  <mark at klomp.org>
 
         * Makefile.am (ICEDTEA_PATCHES): Add missing backslash.
diff -r d850506bcaac -r 6633b7a3a5db Makefile.am
--- a/Makefile.am	Sat Jan 22 20:39:36 2011 +0100
+++ b/Makefile.am	Sat Jan 22 21:47:34 2011 +0100
@@ -1898,6 +1898,11 @@ check-langtools: stamps/jtreg.stamp
 
 check-jdk: stamps/jtreg.stamp
 	mkdir -p test/jdk/JTwork test/jdk/JTreport
+	if test "x$${DISPLAY}" = "x"; then XVFB_RUN="@XVFB_RUN_CMD@"; fi; \
+	if test "x$${DISPLAY}" = "x" && test "x$${XVFB_RUN}" = "x"; then \
+		echo "WARNING: DISPLAY not set and xvfb-run not found"; \
+	fi; \
+	$${XVFB_RUN} \
 	$(BOOT_DIR)/bin/java -jar test/jtreg.jar -v1 -a -ignore:quiet \
 		-w:test/jdk/JTwork -r:test/jdk/JTreport \
 		$${ICEDTEA_JTREG_OTHERVM:--samevm} \
diff -r d850506bcaac -r 6633b7a3a5db configure.ac
--- a/configure.ac	Sat Jan 22 20:39:36 2011 +0100
+++ b/configure.ac	Sat Jan 22 21:47:34 2011 +0100
@@ -52,6 +52,10 @@ IT_CP_SUPPORTS_REFLINK
 IT_CP_SUPPORTS_REFLINK
 IT_CAN_HARDLINK_TO_SOURCE_TREE
 IT_CHECK_FOR_PAX
+
+# Use xvfb-run if found to run gui tests (check-jdk).
+AC_CHECK_PROG(XVFB_RUN_CMD, xvfb-run, [xvfb-run -a -e xvfb-errors], [])
+AC_SUBST(XVFB_RUN_CMD)
 
 AC_MSG_CHECKING([for an Ant home directory])
 AC_ARG_WITH([ant-home],