--- a/buildframework/helium/sf/java/logging/tests/antunit/run-scenario.ant.xml Wed Sep 29 17:48:06 2010 +0100
+++ b/buildframework/helium/sf/java/logging/tests/antunit/run-scenario.ant.xml Sun Oct 10 15:22:15 2010 +0300
@@ -21,36 +21,36 @@
============================================================================
-->
<project name="run-scenario" xmlns:ac="antlib:net.sf.antcontrib" xmlns:au="antlib:org.apache.ant.antunit">
- <description>Helium Antlib logger macro.</description>
+ <description>Helium Antlib logger macro.</description>
- <target name="setUp">
- <tempfile property="temp.dir" suffix=".dir" />
- <mkdir dir="${temp.dir}" />
- <echo>--------------------------------------------</echo>
- </target>
+ <target name="setUp">
+ <tempfile property="temp.dir" suffix=".dir" />
+ <mkdir dir="${temp.dir}" />
+ <echo>--------------------------------------------</echo>
+ </target>
- <target name="tearDown">
- <echo>--------------------------------------------</echo>
- <delete dir="${temp.dir}" />
- </target>
+ <target name="tearDown">
+ <echo>--------------------------------------------</echo>
+ <delete dir="${temp.dir}" />
+ </target>
- <macrodef name="runScenario">
- <attribute name="scenario" />
- <attribute name="target" />
- <sequential>
- <exec osfamily="windows" executable="cmd" dir="${ant.file.run-scenario}/../../scenarii/@{scenario}" failonerror="true">
- <env key="ANT_ARGS" value="${env.ANT_ARGS} -listener com.nokia.helium.logger.ant.listener.StatusAndLogListener" />
- <arg line="/c ..\build.bat @{target}" />
- <arg value="-Dant.executor.class=com.nokia.helium.core.ant.HeliumExecutor" />
- <arg value="-Dtemp.dir=${temp.dir}" />
- </exec>
- <exec osfamily="unix" executable="../bld.sh" dir="${ant.file.run-scenario}/../../scenarii/@{scenario}" failonerror="true">
- <env key="ANT_ARGS" value="${env.ANT_ARGS} -listener com.nokia.helium.logger.ant.listener.StatusAndLogListener" />
- <arg line="@{target}" />
- <arg value="-Dant.executor.class=com.nokia.helium.core.ant.HeliumExecutor" />
- <arg value="-Dtemp.dir=${temp.dir}" />
- </exec>
- </sequential>
- </macrodef>
+ <macrodef name="runScenario">
+ <attribute name="scenario" />
+ <attribute name="target" />
+ <sequential>
+ <exec osfamily="windows" executable="cmd" dir="${ant.file.run-scenario}/../../scenarii/@{scenario}" failonerror="true">
+ <env key="ANT_ARGS" value="${env.ANT_ARGS} -listener com.nokia.helium.logger.ant.listener.CommonListener" />
+ <arg line="/c ..\build.bat @{target}" />
+ <arg value="-Dant.executor.class=com.nokia.helium.core.ant.HeliumExecutor" />
+ <arg value="-Dtemp.dir=${temp.dir}" />
+ </exec>
+ <exec osfamily="unix" executable="../bld.sh" dir="${ant.file.run-scenario}/../../scenarii/@{scenario}" failonerror="true">
+ <env key="ANT_ARGS" value="${env.ANT_ARGS} -listener com.nokia.helium.logger.ant.listener.CommonListener" />
+ <arg line="@{target}" />
+ <arg value="-Dant.executor.class=com.nokia.helium.core.ant.HeliumExecutor" />
+ <arg value="-Dtemp.dir=${temp.dir}" />
+ </exec>
+ </sequential>
+ </macrodef>
</project>