svn commit: r1396001 - /incubator/ooo/trunk/test/run

[hd...@apache.org]

Author: hdu
Date: Tue Oct  9 12:43:19 2012
New Revision: 1396001

URL: http://svn.apache.org/viewvc?rev=1396001&view=rev
Log:
allow autotests to run on a DISPLAY other than :0.0

Running the automated tests on another display is a good idea, e.g. because our
autotests currently depend on the X11 keyboard being set to an en_US layout
(as defined in test/testcommon/source/org/openoffice/test/vcl/Tester.java),
to allow multiple test sessions and to allow running the tests on a developer
machine without disrupting the normal work too much. Being able to set the
DISPLAY variable to be different from :0.0 is very useful for all this.

FWIW: an X11 server that works well with our automated tests is
    Xephyr :99 -keybd ephyr,,,xkbmodel=evdev,xkblayout=en_US -screen 1440x900
and the DISPLAY variable has to be set to :99 for running with that.

Modified:
    incubator/ooo/trunk/test/run

Modified: incubator/ooo/trunk/test/run
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/test/run?rev=1396001&r1=1396000&r2=1396001&view=diff
==============================================================================
--- incubator/ooo/trunk/test/run (original)
+++ incubator/ooo/trunk/test/run Tue Oct  9 12:43:19 2012
@@ -1,5 +1,8 @@
 #! /bin/sh
 . /etc/profile
-export DISPLAY=:0.0
+if [ -z "$DISPLAY" ]; then
+	export DISPLAY=:0.0
+fi
+
 BASE=$(cd `dirname "$0"`; pwd)
 eval java -cp \"$BASE/lib/junit.jar:$BASE/testcommon/bin:$BASE/testgui/bin:$BASE/testuno/bin:$BASE/testgui/data:$BASE/testuno/data\" org.openoffice.test.Run -r org.openoffice.test.common.Installer -l org.openoffice.test.common.XMLReporter -l org.openoffice.test.common.ReportUploader \"-Dtestspace=$BASE/testspace\" -Dsingleton=true "$*"