move to unified archived repos
diff --git a/releng.wtpbuilder/distribution/jsdt.package/createFinalRepo.xml b/releng.wtpbuilder/distribution/jsdt.package/createFinalRepo.xml
index 34d340b..9fe8809 100644
--- a/releng.wtpbuilder/distribution/jsdt.package/createFinalRepo.xml
+++ b/releng.wtpbuilder/distribution/jsdt.package/createFinalRepo.xml
@@ -335,7 +335,7 @@
<!-- create archived repo from contents of 'repository' at this point -->
<property
name="zippedtestsrepo"
- value="${build.distribution}-and-tests-repo-${buildLabel}.zip"/>
+ value="${build.distribution}-unittests-repo-${buildLabel}.zip"/>
<zip
destfile="${buildDirectory}/${buildLabel}/${zippedtestsrepo}"
basedir="${buildDirectory}/${buildLabel}/repositoryunittests"/>
diff --git a/releng.wtpbuilder/distribution/wtp.package/createFinalRepo.xml b/releng.wtpbuilder/distribution/wtp.package/createFinalRepo.xml
index 40b8fd6..4173af5 100644
--- a/releng.wtpbuilder/distribution/wtp.package/createFinalRepo.xml
+++ b/releng.wtpbuilder/distribution/wtp.package/createFinalRepo.xml
@@ -54,7 +54,9 @@
unless="baseComparatorRepoDir"
message="baseComparatorRepoDir must be defined for this ant script"/>
- <property name="baseComparatorRepoDirTests" value="${baseComparatorRepoDir}"/>
+ <property
+ name="baseComparatorRepoDirTests"
+ value="${baseComparatorRepoDir}"/>
<!-- if not otherwise set, use these default properties
<property
@@ -136,6 +138,12 @@
file="${baseComparatorRepoDir}"
type="dir"
property="baseComparatorRepoDirExists"/>
+ <!-- we copy the comparator filter file, used only during tests, to build output location,
+ just so it is always available, even if tests ran later -->
+ <copy
+ file="${env.PROJECT_BUILDERS}/${projectname}/${env.RELENG}/maps/comparatorfilter.properties"
+ todir="${buildDirectory}/${buildLabel}"/>
+
</target>
<!-- normally, the "prime repository" should be created from previous release,
or similar, but if that hasn't been done, we'll automatically create an empty
@@ -269,10 +277,10 @@
name="doMirrorTests"
depends="primeTestRepo">
<property
- name="destinationDir"
- value="${buildDirectory}/${buildLabel}/unittestrepository"/>
+ name="destinationDirTests"
+ value="${buildDirectory}/${buildLabel}/repositoryunittests"/>
<echo
- message="destinationDir: ${destinationDir}"/>
+ message="destinationDirTests: ${destinationDirTests}"/>
<p2.mirror
ignoreErrors="true"
@@ -282,12 +290,12 @@
<destination
kind="metadata"
- location="file:/${destinationDir}"
- name="Web Tools Platform Repository ${buildLabel}"/>
+ location="file:/${destinationDirTests}"
+ name="Web Tools Platform Repository for Unit Tests ${buildLabel}"/>
<destination
kind="artifact"
- location="file:/${destinationDir}"
- name="Web Tools Platform Repository ${buildLabel}"/>
+ location="file:/${destinationDirTests}"
+ name="Web Tools Platform Repository for Unit Tests ${buildLabel}"/>
<source>
@@ -330,7 +338,7 @@
value="${build.distribution}-unittests-repo-${buildLabel}.zip"/>
<zip
destfile="${buildDirectory}/${buildLabel}/${zippedtestsrepo}"
- basedir="${buildDirectory}/${buildLabel}/repository"/>
+ basedir="${buildDirectory}/${buildLabel}/repositoryunittests"/>
<ant
antfile="${wtp.builder.home}/scripts/build/buildutilitiesp2.xml"
diff --git a/releng.wtpbuilder/distribution/wtp.package/createziptasks.xml b/releng.wtpbuilder/distribution/wtp.package/createziptasks.xml
index f2ad079..cadb4a5 100644
--- a/releng.wtpbuilder/distribution/wtp.package/createziptasks.xml
+++ b/releng.wtpbuilder/distribution/wtp.package/createziptasks.xml
@@ -51,7 +51,7 @@
antfile="${wtp.builder.home}/scripts/build/ziputils.xml"
target="premirrortasks"/>
<p2.mirror
- source="${buildDirectory}/${buildLabel}/repository"
+ source="${buildDirectory}/${buildLabel}/repositoryunittests"
destination="${tempRepo}"
log="${buildDirectory}/${buildLabel}/mirrorlog-${newarchiveName}.log"
verbose="true">
diff --git a/releng.wtpbuilder/distribution/wtp.site/templateFiles/index.html.template.php b/releng.wtpbuilder/distribution/wtp.site/templateFiles/index.html.template.php
index cfed798..ed8d235 100644
--- a/releng.wtpbuilder/distribution/wtp.site/templateFiles/index.html.template.php
+++ b/releng.wtpbuilder/distribution/wtp.site/templateFiles/index.html.template.php
@@ -127,7 +127,7 @@
<?php } ?>
<?php
- $shortname="${build_distribution}-and-tests";
+ $shortname="${build_distribution} unit tests";
$zipfilename=$shortname."-repo-".$build;
$filename=$zipfilename.".zip";
diff --git a/tests/org.eclipse.wtp.releng.tests/src/org/eclipse/wtp/releng/tests/BuildTests.java b/tests/org.eclipse.wtp.releng.tests/src/org/eclipse/wtp/releng/tests/BuildTests.java
index 9031770..2cd5f10 100644
--- a/tests/org.eclipse.wtp.releng.tests/src/org/eclipse/wtp/releng/tests/BuildTests.java
+++ b/tests/org.eclipse.wtp.releng.tests/src/org/eclipse/wtp/releng/tests/BuildTests.java
@@ -700,8 +700,4 @@
assertEquals("There were unexpected Comparator messages. See " + ComparatorLog.COMPARATOR_UNEXPECTED_MESSAGES_LOG_TXT, 0, comparatorLog.getNumberOfUnexpectedMessages());
}
- public void testComparatorLogTests() throws IOException {
- ComparatorLog comparatorLog = new ComparatorLog();
- assertEquals("There were unexpected Comparator messages. See " + ComparatorLog.COMPARATOR_UNEXPECTED_MESSAGES_LOG_TXT, 0, comparatorLog.getNumberOfUnexpectedMessages());
- }
}
diff --git a/tests/org.eclipse.wtp.releng.tests/src/org/eclipse/wtp/releng/tests/ComparatorLog.java b/tests/org.eclipse.wtp.releng.tests/src/org/eclipse/wtp/releng/tests/ComparatorLog.java
index f1a4f53..199230e 100644
--- a/tests/org.eclipse.wtp.releng.tests/src/org/eclipse/wtp/releng/tests/ComparatorLog.java
+++ b/tests/org.eclipse.wtp.releng.tests/src/org/eclipse/wtp/releng/tests/ComparatorLog.java
@@ -378,9 +378,9 @@
File outfile = new File(getComparatorOutputSummaryDir(), COMPARATOR_EXCLUDED_MESSAGES_LOG_TXT);
FileWriter out = new FileWriter(outfile);
output = new BufferedWriter(out);
- output.write(EOL + EOL + "Non-significant (expected) Comparator Messages" + EOL + EOL);
- output.write("Using filter properties from: " + getComparatorRulesInstance().getFilterPropertyFileLocation());
- output.write(getSummary() + EOL + EOL);
+ output.write(EOL + EOL + "Non-significant (expected) Comparator Messages" + EOL);
+ output.write(EOL + "Using filter properties from: " + getComparatorRulesInstance().getFilterPropertyFileLocation() + EOL);
+ output.write(EOL + getSummary() + EOL + EOL);
int count = 1;
for (Iterator iterator = excludedMessages.iterator(); iterator.hasNext();) {