Mercurial > hg > icedtea12
changeset 2362:5cdaab119e8a
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.
| author | Mark Wielaard <mark@klomp.org> |
|---|---|
| date | Sat, 22 Jan 2011 21:47:34 +0100 |
| parents | ce49b3019799 |
| children | c52c8d297c79 |
| files | ChangeLog Makefile.am configure.ac |
| diffstat | 3 files changed, 15 insertions(+), 0 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog Fri Jan 21 22:53:33 2011 +0100 +++ b/ChangeLog Sat Jan 22 21:47:34 2011 +0100 @@ -1,3 +1,9 @@ +2010-01-22 Mark Wielaard <mark@klomp.org> + + * configure.ac: Add xvfb-run AC_CHECK_PROG. + * Makefile.am (check-jdk): Use xvfb-run if available and DISPLAY + not set. + 2011-01-21 Mark Wielaard <mark@klomp.org> * configure.ac (--with-llvm-config): Handle yes/no.
--- a/Makefile.am Fri Jan 21 22:53:33 2011 +0100 +++ b/Makefile.am Sat Jan 22 21:47:34 2011 +0100 @@ -2216,6 +2216,11 @@ if WITH_CACAO CACAO_EXCLUDE="-exclude:$(abs_top_srcdir)/test/jtreg/excludelist.jdk.cacao.jtx" endif + 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} \
--- a/configure.ac Fri Jan 21 22:53:33 2011 +0100 +++ b/configure.ac Sat Jan 22 21:47:34 2011 +0100 @@ -55,6 +55,10 @@ IT_DISABLE_LANGTOOLS_TESTS IT_DISABLE_JDK_TESTS +# 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([whether to build the browser plugin]) AC_ARG_ENABLE([plugin], [AS_HELP_STRING([--disable-plugin],