--- a/buildframework/helium/sf/java/logging/tests/antunit/run-scenario.ant.xml	Wed Jun 16 16:51:40 2010 +0300
+++ b/buildframework/helium/sf/java/logging/tests/antunit/run-scenario.ant.xml	Fri Aug 13 14:59:05 2010 +0300
@@ -23,12 +23,14 @@
 <project name="run-scenario" xmlns:ac="antlib:net.sf.antcontrib" xmlns:au="antlib:org.apache.ant.antunit">
     <description>Helium Antlib logger macro.</description>
 
-    <target name="setUp">    
+    <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>
     
@@ -36,28 +38,18 @@
         <attribute name="scenario" />
         <attribute name="target" />
         <sequential>
-            <ac:trycatch property="scenario.unittest.error">
-                <try>
-                    <exec osfamily="windows" executable="cmd" dir="${file.run-scenario}/../../scenarii/@{scenario}" failonerror="true" errorproperty="scenario.unittest.error.log">
-                        <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="${file.run-scenario}/../../scenarii/@{scenario}" failonerror="true" errorproperty="scenario.unittest.error.log">
-                        <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>
-                </try>
-            </ac:trycatch>
-            <!--<loadfile property="scenario.unittest.error.log" srcFile="${temp.dir}/scenario.log" />-->
-            <au:assertTrue message="${scenario.unittest.error.log}">
-                <not>
-                    <isset property="scenario.unittest.error" />
-                </not>
-            </au:assertTrue>
+            <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>