--- a/buildframework/helium/tests/minibuilds/compile/build.xml	Wed Oct 28 14:39:48 2009 +0000
+++ b/buildframework/helium/tests/minibuilds/compile/build.xml	Wed Dec 23 19:29:07 2009 +0200
@@ -50,7 +50,8 @@
 
 	<!-- Archiving configuration-->
 	<property name="zip.config.file" location="archive.cfg.xml" />
-	<property name="zips.ee.spec.name" value="minibuild_archive" />
+    <property name="zips.ee.spec.name" value="minibuild_archive" />
+    <property name="zips.ee-empty.spec.name" value="empty_minibuild_archive" />
 
 	<!-- Synergy is not configured -->
 	<property name="skip.password.validation" value="1" />
@@ -97,7 +98,7 @@
 	
     <!-- Test ec history option is create for single node build and merge is for multinode build. -->
     <target name="test-ec-history-option" if="build.system.ec-helium">
-        <loadfile srcfile="${build.log.dir}/${build.id}.${sysdef.configurations.list}_run_emake.bat" property="emake.bat.file"/>
+        <loadfile srcfile="${temp.build.dir}/${build.id}.${sysdef.configurations.list}_run_emake.bat" property="emake.bat.file"/>
         <if>
             <equals arg1="${ec.maxagents}" arg2="1" />
             <then>
@@ -232,7 +233,7 @@
 	</target>
 
 
-	<target name="mini-build-archive" depends="mini-build-archive-ant,mini-build-archive-ec-full" />
+	<target name="mini-build-archive" depends="mini-build-archive-ant,mini-build-archive-ec-full,mini-build-archive-ant-empty-config" />
 
 	<!-- This target will copy a part of the tree structure to test policy.remover mapper. -->
 	<target name="prepare-archiving">
@@ -265,6 +266,14 @@
 			<param name="zipping.type" value="ant" />
 			<!-- Uses to set the target location -->
 		</antcall>
+	    
+    </target>
+ 
+    <target name="mini-build-archive-ant-empty-config">
+        <hlm:zipContentMacro type="ee-empty" ec="false" file="${zip.config.file}" failonemptyconfig="false" />
+        <au:expectfailure>
+            <hlm:zipContentMacro type="ee-empty" ec="false" file="${zip.config.file}" failonemptyconfig="true" />
+        </au:expectfailure>
 	</target>
 
 	<target name="do-mini-build-archive">
@@ -288,7 +297,7 @@
 
 
 	<target name="mini-build-cleanup">
-		<delete verbose="true" includeemptydirs="true">		 
+		<delete verbose="true" includeemptydirs="true" failonerror="false">		 
 			<fileset dir="${build.drive}/" casesensitive="false">
 				<include name="makefile" />
 				<include name="*.mk" />
@@ -342,7 +351,7 @@
 			<isset property="build.system.ec-helium" />
 			<then>
 				<au:assertFileExists file="${build.drive}/emake.data" />
-				<au:assertFileExists file="${build.log.dir}/${build.id}.helium_minibuild_compile_run_emake.bat" />
+				<au:assertFileExists file="${temp.build.dir}/${build.id}.helium_minibuild_compile_run_emake.bat" />
 			</then>
 		</if>
 
@@ -367,7 +376,7 @@
 				<include name="fota" />
 			</targetset>
 		</imakerconfiguration>
-		<imakerconfiguration regionalVariation="true">
+		<imakerconfiguration>
 			<makefileset>
 			    <include name="**/${product.name}/*ui.mk"/>
 			</makefileset>
@@ -388,5 +397,6 @@
 		<include name="s60/app/**/*.mmp" />
 	</fileset>
 
+    <import file="build.sbsinput.ant.xml" />
 </project>