diff options
| author | rescobar | 2010-09-01 00:47:55 +0000 |
|---|---|---|
| committer | rescobar | 2010-09-01 00:47:55 +0000 |
| commit | 605e21d6f7c9c28db69341e2025ffbe552a196e6 (patch) | |
| tree | 81e7847c4ae1ba894fc081a78a478d2f7de391aa /releng | |
| parent | 8c560783a2bb0c6e93d42c027e4f2d5e0954b2f1 (diff) | |
| download | org.eclipse.osee-605e21d6f7c9c28db69341e2025ffbe552a196e6.tar.gz org.eclipse.osee-605e21d6f7c9c28db69341e2025ffbe552a196e6.tar.xz org.eclipse.osee-605e21d6f7c9c28db69341e2025ffbe552a196e6.zip | |
Create Test Snapshots
Diffstat (limited to 'releng')
| -rw-r--r-- | releng/org.eclipse.osee.client.releng/build.xml | 2 | ||||
| -rwxr-xr-x | releng/org.eclipse.osee.server.releng/build.xml | 32 |
2 files changed, 32 insertions, 2 deletions
diff --git a/releng/org.eclipse.osee.client.releng/build.xml b/releng/org.eclipse.osee.client.releng/build.xml index 36405b750c6..dce847dbd17 100644 --- a/releng/org.eclipse.osee.client.releng/build.xml +++ b/releng/org.eclipse.osee.client.releng/build.xml @@ -177,7 +177,7 @@ <pathconvert property="oseeClientUnitTestsZip" setonempty="false"> <path> <fileset dir="${tempTestSnapFolder}/testing"> - <include name="osee_client-junit-tests-*.zip" /> + <include name="*-junit-tests-*.zip" /> </fileset> </path> </pathconvert> diff --git a/releng/org.eclipse.osee.server.releng/build.xml b/releng/org.eclipse.osee.server.releng/build.xml index 285c877e7e2..2e9013eb326 100755 --- a/releng/org.eclipse.osee.server.releng/build.xml +++ b/releng/org.eclipse.osee.server.releng/build.xml @@ -105,7 +105,7 @@ <antcall target="setHttpProxy" /> <ant antfile="${relengCommonBuilderDir}/buildAll.xml" target="runEclipse" dir="${relengCommonBuilderDir}" inheritrefs="true" inheritall="true" /> </target> - + <target name="setHttpProxy" if="http.proxyHost"> <echo message="proxy: - ${http.proxyHost}:${http.proxyPort}" /> <setproxy proxyhost="${http.proxyHost}" proxyport="${http.proxyPort}" /> @@ -144,10 +144,12 @@ <copy flatten="true" toDir="${snapshotFolder}" failonerror="true" includeemptydirs="false"> <fileset dir="${buildFolder}" includes="athena/*-Update-*.zip" /> <fileset dir="${buildFolder}" includes="athena/*-osgi-runtime-*.zip" /> + <fileset dir="${buildFolder}" includes="athena/*-Automated-Tests-*.zip" /> </copy> <available file="${snapshotFolder}" property="containsFile" /> <antcall target="doMoveZip" inheritall="true" /> + <antcall target="createUnitTestSnapshot" inheritall="true" /> </target> <target name="doMoveZip" if="containsFile"> @@ -159,4 +161,32 @@ <fileset dir="${snapshotFolder}" includes="*-osgi-runtime-*.zip" /> </move> </target> + + <target name="createUnitTestSnapshot"> + <property name="snapshotTestZipArchive" value="${zipPrefix}-update-tests${incubation}-${BUILDTYPE}-Snapshot.zip" /> + + <property name="fullTestSuite" value="${snapshotFolder}/full_test_suite-Snapshot.zip" /> + <property name="tempTestSnapFolder" value="${snapshotFolder}/test_snap_tmp" /> + + <move includeemptydirs="false" tofile="${fullTestSuite}" filtering="true"> + <fileset dir="${snapshotFolder}"> + <filename name="*-Automated-Tests-*.zip" /> + </fileset> + </move> + + <mkdir dir="${tempTestSnapFolder}" /> + <unzip src="${fullTestSuite}" dest="${tempTestSnapFolder}" /> + + <pathconvert property="oseeClientUnitTestsZip" setonempty="false"> + <path> + <fileset dir="${tempTestSnapFolder}/testing"> + <include name="*-junit-tests-*.zip" /> + </fileset> + </path> + </pathconvert> + <move file="${oseeClientUnitTestsZip}" tofile="${snapshotFolder}/${snapshotTestZipArchive}" /> + + <delete failonerror="false" file="${fullTestSuite}" /> + <delete failonerror="false" dir="${tempTestSnapFolder}" /> + </target> </project> |