Author: damjan
Date: Sun Oct 11 11:57:53 2015
New Revision: 1707966
URL: http://svn.apache.org/viewvc?rev=1707966&view=rev
Log:
When ./configure --with-package-format=installed is used, allow tests to run
from the resulting install directory instead of needing an archive.
Modified:
openoffice/trunk/test/build.xml
Modified: openoffice/trunk/test/build.xml
URL:
http://svn.apache.org/viewvc/openoffice/trunk/test/build.xml?rev=1707966&r1=1707965&r2=1707966&view=diff
==============================================================================
--- openoffice/trunk/test/build.xml (original)
+++ openoffice/trunk/test/build.xml Sun Oct 11 11:57:53 2015
@@ -139,9 +139,19 @@
</target>
<target name="test" depends="compile" description="start test">
+ <!-- Try the specified ${openoffice.home} first -->
<condition property="test.arg0"
value="-Dopenoffice.home=${openoffice.home}">
<isset property="openoffice.home" />
</condition>
+
+ <!-- Next try the internal install path that the
with-package-format=installed option to configure uses -->
+ <available type="dir"
file="${env.SRC_ROOT}/instsetoo_native/${env.INPATH}/Apache_OpenOffice/installed/install/en-US/openoffice4/program"
+ property="internalInstalledDir"
value="${env.SRC_ROOT}/instsetoo_native/${env.INPATH}/Apache_OpenOffice/installed/install/en-US/openoffice4/program"/>
+ <condition property="test.arg0"
value="-Dopenoffice.home=${internalInstalledDir}">
+ <isset property="internalInstalledDir" />
+ </condition>
+
+ <!-- Finally try the tar.gz and zip archives which build by
default -->
<pathconvert property="openoffice.pack" setonempty="false">
<path>
<fileset
dir="${env.SRC_ROOT}/instsetoo_native/${env.INPATH}/Apache_OpenOffice/archive/install/en-US"
includes="*.tar.gz,*.zip" erroronmissingdir="false"/>
@@ -150,6 +160,7 @@
<condition property="test.arg0"
value="-Dopenoffice.pack=${openoffice.pack}">
<isset property="openoffice.pack" />
</condition>
+
<fail message="No OpenOffice available!" unless="test.arg0"/>
<condition property="test.executable" value="./run.bat">
<os family="windows" />
