303564 - (improve standalone tests)

releng.wtpbuilder/distribution/wtp.site/build.xml

@@ -24,14 +24,13 @@
         message="ant.file: ${ant.file}"/>
     <target
         name="build">
-        <mkdir
-            dir="${buildDirectory}/${buildLabel}"/>
-    	
-    	 <!-- make sure there is a base builder, since we need the launcher -->
-    	 <ant antfile="${wtp.builder.home}/scripts/build/runbuild.xml"
-    	      target="getBaseBuilder" />
-    	 	
-    	 	
+        
+        <!-- make sure there is a base builder, since we need the launcher -->
+        <ant
+            antfile="${wtp.builder.home}/scripts/build/runbuild.xml"
+            target="getBaseBuilder"/>
+
+
         <java
             jar="${eclipse.launcher}"
             fork="true"
@@ -101,6 +100,11 @@
             antfile="${wtp.builder.home}/scripts/build/label.xml"/>
         <property
             file="${buildDirectory}/label.properties"/>
+    	
+    	<!-- buildLabel is defined in label.properties -->
+        <mkdir
+            dir="${buildDirectory}/${buildLabel}"/>
+
         <property
             name="publish.xml"
             value="${component.dir}/publish.xml"/>

releng.wtpbuilder/scripts/standaloneTest/standaloneTest.xml

@@ -65,6 +65,24 @@
         unless="dependency.properties.exists"/>
     <target
         name="standaloneTest">
+	
+       <!-- 
+       copy our "map direcotry" to main build area. The are checked out by "checkout" script. 
+       Things like 'dependencies.properties' are 
+       required to be located there, such as when "site" is created at end of testing. 
+       -->
+        <echo
+            message="copy maps"/>
+        <echo
+            message="todir: ${buildDirectory}/maps/${env.RELENG}/"/>
+        <echo
+            message="from:  ${env.PROJECT_BUILDERS}/${projectname}/${env.RELENG}/"/>
+        <copy
+            todir="${buildDirectory}/maps/${env.RELENG}">
+            <fileset
+                dir="${env.PROJECT_BUILDERS}/${projectname}/${env.RELENG}"/>
+        </copy>
+
         <property
             file="${build.home}/${env.RELENG_BUILDER}/build.properties"/>
         <property
@@ -81,18 +99,18 @@
             value="true"/>
         <property
             name="getprereq.wtptests"
-            value="true"/> 
+            value="true"/>
         <property
             name="test.installed"
-            value="true"/>  
+            value="true"/>
         <property
             name="doNotPublishEarly"
-            value="true"/>          
+            value="true"/>
         <mkdir
-            dir="${env.RECOMMENDED_TMP_DIR}"/>    
+            dir="${env.RECOMMENDED_TMP_DIR}"/>
         <mkdir
             dir="${testRoot}"/>
-            
+
         <condition
             property="installed">
             <available
@@ -108,7 +126,7 @@
         <antcall
             target="run"/>
     </target>
-    
+
     <target
         name="run">
         <ant
@@ -131,6 +149,20 @@
             file="${wtp.builder.home}/distribution/${build.distribution}.tests/templateFiles/index.php"
             todir="${testRoot}/results"
             overwrite="true"/>
+        <available
+            file="${wtp.builder.home}/distribution/${build.distribution}.site/build.xml"
+            property="createSite"/>
+
+        <antcall
+            target="createSite"/>
+    </target>
+
+    <target
+        name="createSite"
+        if="createSite">
+        <ant
+            antfile="${wtp.builder.home}/distribution/${build.distribution}.site/build.xml"/>
+
     </target>
     <target
         name="clean"