diff options
| author | Eike Stepper | 2011-06-26 11:04:58 +0000 |
|---|---|---|
| committer | Eike Stepper | 2011-06-26 11:04:58 +0000 |
| commit | 2969c19d0b44fb992ab68a719c6f677e5b785cea (patch) | |
| tree | cce7c74331696a4999cfa634e60e818cc346d8f6 | |
| parent | 355c06dd3a37ca13e112807e98d1695c8c43a3ed (diff) | |
| download | cdo-2969c19d0b44fb992ab68a719c6f677e5b785cea.tar.gz cdo-2969c19d0b44fb992ab68a719c6f677e5b785cea.tar.xz cdo-2969c19d0b44fb992ab68a719c6f677e5b785cea.zip | |
| -rw-r--r-- | releng/org.eclipse.emf.cdo.releng/build.xml | 14 | ||||
| -rw-r--r-- | releng/org.eclipse.emf.cdo.releng/hudson/test-report-empty.xml (renamed from releng/org.eclipse.emf.cdo.releng/hudson/testReportEmpty.xml) | 0 |
2 files changed, 7 insertions, 7 deletions
diff --git a/releng/org.eclipse.emf.cdo.releng/build.xml b/releng/org.eclipse.emf.cdo.releng/build.xml index ba147909fd..7fac7775f4 100644 --- a/releng/org.eclipse.emf.cdo.releng/build.xml +++ b/releng/org.eclipse.emf.cdo.releng/build.xml @@ -145,11 +145,9 @@ <delete failonerror="false"> <fileset dir="${result}"> <include name="bom.xml" /> - <include name="coverageReport.xml" /> - <include name="testReport.xml" /> + <include name="test-report.xml" /> </fileset> </delete> - </target> <target name="get.director" unless="director.exists"> @@ -335,8 +333,8 @@ </buckminster> <echo message="Creating a empty test report to make Hudson happy" /> - <copy file="${build.root}/org.eclipse.emf.cdo/releng/org.eclipse.emf.cdo.releng/hudson/testReportEmpty.xml" - tofile="${result}/testReport.xml" /> + <copy file="${build.root}/org.eclipse.emf.cdo/releng/org.eclipse.emf.cdo.releng/hudson/test-report-empty.xml" + tofile="${result}/test-report.xml" /> </target> <target name="build.workspace" depends="provision"> @@ -383,7 +381,7 @@ <antcall target="generate.buildinfos" /> <antcall target="generate.bookmarks" /> <antcall target="generate.index" /> - <antcall target="generate.categories" /> + <!--<antcall target="generate.categories" />--> <antcall target="generate.zip.dropins" /> <echo message="Deleting ${content.xml}" /> @@ -420,6 +418,7 @@ <xslt style="xsl/content2xml.xsl" in="${content.xml}" out="${site.p2.dir}/index.xml" /> </target> + <!-- DONE BY PROMOTION <target name="generate.categories"> <property name="categories.repo" value="${site.p2.dir}/categories" /> <property name="categories.xml" value="${categories.repo}/content.xml" /> @@ -450,6 +449,7 @@ </zip> <delete file="${categories.xml}" /> </target> + --> <target name="generate.zip.dropins" if="zip.dropins"> <mkdir dir="${buckminster.temp.zips}" /> @@ -496,7 +496,7 @@ <arg value="-l" /> <arg value="org.eclipse.emf.cdo.tests/CDO AllTests.launch" /> <arg value="-o" /> - <arg value="${result}/testReport.xml" /> + <arg value="${result}/test-report.xml" /> <arg value="--terseXML" /> <arg value="--flatXML" /> </cmdargs> diff --git a/releng/org.eclipse.emf.cdo.releng/hudson/testReportEmpty.xml b/releng/org.eclipse.emf.cdo.releng/hudson/test-report-empty.xml index ea5a30a34e..ea5a30a34e 100644 --- a/releng/org.eclipse.emf.cdo.releng/hudson/testReportEmpty.xml +++ b/releng/org.eclipse.emf.cdo.releng/hudson/test-report-empty.xml |