From 0026d9becf489657e300fb2b65e67287475c7060 Mon Sep 17 00:00:00 2001
From: Christophe Sovant <christophe.sovant@forgerock.com>
Date: Fri, 11 Sep 2009 14:48:00 +0000
Subject: [PATCH] Improvements in ant build + update STAF/services versions + dynamic dsmlService compilation/loading
---
opends/tests/staf-tests/shared/ant/tests.xml | 12 ++++++++----
1 files changed, 8 insertions(+), 4 deletions(-)
diff --git a/opends/tests/staf-tests/shared/ant/tests.xml b/opends/tests/staf-tests/shared/ant/tests.xml
index 163b40f..1976929 100644
--- a/opends/tests/staf-tests/shared/ant/tests.xml
+++ b/opends/tests/staf-tests/shared/ant/tests.xml
@@ -95,17 +95,17 @@
<property name="tests.request" value="EXECUTE FILE ${tests.xml} JOBNAME OpenDS_${tests.type} SCRIPTFILE ${tests.run.dir}/${tests.run.time}/config/${tests.config.file} WAIT CLEARLOGS"/>
<echo>While the tests are running you may tail the job logs at</echo>
- <echo>${staf.install.dir}/logs/MACHINE/${host.name}</echo>
+ <echo>${staf.install.dir}/${staf.name}/logs/MACHINE/${host.name}</echo>
<echo>Running tests. This will take more than a while.</echo>
- <property name="CLASSPATH" value="${staf.lib.dir}/JSTAF.jar${path.separator}${e.CLASSPATH}"/>
+ <property name="CLASSPATH" value="${staf.lib.dir}/JSTAF.jar:."/>
<exec
dir="${staf.bin.dir}"
executable="${staf.executable}"
>
<arg line="LOCAL STAX ${tests.request}"/>
- <env key="CLASSPATH" path="${staf.lib.dir}/JSTAF.jar${path.separator}${e.CLASSPATH}"/>
+ <env key="CLASSPATH" path="${staf.lib.dir}/JSTAF.jar:."/>
<env key="LD_LIBRARY_PATH" value="${staf.lib.dir}"/>
- <env key="STAFCONVDIR" value="${staf.install.dir}/codepage"/>
+ <env key="STAFCONVDIR" value="${staf.install.dir}/${staf.name}/codepage"/>
<env key="STAFCODEPAGE" value="LATIN_1"/>
</exec>
@@ -165,6 +165,10 @@
defaultvalue="${ldclt.dir}"
addproperty="ldclt.dir.input"/>
</then>
+ <else>
+ <property name="client.hostname.input" value="${client.hostname}"/>
+ <property name="ldclt.dir.input" value="${ldclt.dir}"/>
+ </else>
</if>
<input message=" Enter path to logs directory:"
--
Gitblit v1.10.0