[164184] Add Dali distribution to WTP Builder R2.0

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

@@ -40,9 +40,6 @@
         <unzip dest="${testRoot}" src="${buildDirectory}/${buildLabel}/wtp-jsf-${buildLabel}.zip" overwrite="true" />
         <unzip dest="${testRoot}" src="${buildDirectory}/${buildLabel}/wtp-jsf-Automated-Tests-${buildLabel}.zip" overwrite="true" />
 
-        <unzip dest="${testRoot}" src="${buildDirectory}/${buildLabel}/wtp-jpa-${buildLabel}.zip" overwrite="true" />
-        <unzip dest="${testRoot}" src="${buildDirectory}/${buildLabel}/wtp-jpa-Automated-Tests-${buildLabel}.zip" overwrite="true" />
-
         <antcall target="runTestEclipse">
             <param name="testTarget" value="all" />
         </antcall>
@@ -59,6 +56,9 @@
             <jvmarg value="-Dosgi.ws=${basews}" />
             <jvmarg value="-Dosgi.os=${baseos}" />
             <jvmarg value="-Dosgi.arch=${basearch}" />
+            <jvmarg value="-Dws=${basews}" />
+            <jvmarg value="-Dos=${baseos}" />
+            <jvmarg value="-Darch=${basearch}" />
             <jvmarg value="-Dnoclean=true" />
             <jvmarg value="-DbuildBranch=${buildBranch}" />
             <jvmarg value="-DbuildType=${buildType}" />