Bug 444243 - Improve scripts to handle performance tests.
Corrected spelling error.
diff --git a/bundles/org.eclipse.build.tools/buildTools.jar b/bundles/org.eclipse.build.tools/buildTools.jar
index aab6138..5b2cc34 100644
--- a/bundles/org.eclipse.build.tools/buildTools.jar
+++ b/bundles/org.eclipse.build.tools/buildTools.jar
Binary files differ
diff --git a/bundles/org.eclipse.build.tools/buildTools.jar.jardesc b/bundles/org.eclipse.build.tools/buildTools.jar.jardesc
index d53d7f5..0bbda16 100644
--- a/bundles/org.eclipse.build.tools/buildTools.jar.jardesc
+++ b/bundles/org.eclipse.build.tools/buildTools.jar.jardesc
@@ -11,11 +11,11 @@
</manifest>
<selectedElements exportClassFiles="true" exportJavaFiles="true" exportOutputFolder="false">
<file path="/org.eclipse.build.tools/.classpath"/>
- <file path="/org.eclipse.build.tools/.project"/>
- <folder path="/org.eclipse.build.tools/META-INF"/>
<file path="/org.eclipse.build.tools/build.properties"/>
- <file path="/org.eclipse.build.tools/about.html"/>
+ <folder path="/org.eclipse.build.tools/META-INF"/>
+ <file path="/org.eclipse.build.tools/.project"/>
<file path="/org.eclipse.build.tools/plugin.xml"/>
+ <file path="/org.eclipse.build.tools/about.html"/>
<javaElement handleIdentifier="=org.eclipse.build.tools/src"/>
<file path="/org.eclipse.build.tools/.gitignore"/>
<file path="/org.eclipse.build.tools/plugin.properties"/>
diff --git a/bundles/org.eclipse.build.tools/src/org/eclipse/releng/generators/EclipseTestResultsGeneratorNoMail.java b/bundles/org.eclipse.build.tools/src/org/eclipse/releng/generators/EclipseTestResultsGeneratorNoMail.java
index c390d22..1da1ff8 100644
--- a/bundles/org.eclipse.build.tools/src/org/eclipse/releng/generators/EclipseTestResultsGeneratorNoMail.java
+++ b/bundles/org.eclipse.build.tools/src/org/eclipse/releng/generators/EclipseTestResultsGeneratorNoMail.java
@@ -31,7 +31,7 @@
test.setTestResultsHtmlFileName("testResults.php");
test.setDropHtmlFileName("index.php");
// test.setDropHtmlFileName("index.html");
- test.setPlatformIdentifierToken("%platform%");
+ //test.setPlatformIdentifierToken("%platform%");
test.setHrefTestResultsTargetPath("/shared/eclipse/builds/4I/siteDir/eclipse/downloads/drops4/I20140923-0105/testresults");
test.setCompileLogsDirectoryName("/shared/eclipse/builds/4I/siteDir/eclipse/downloads/drops4/I20140923-0105/compilelogs");
test.setHrefCompileLogsTargetPath("compilelogs");
@@ -72,66 +72,13 @@
// generate http, md5 and sha1 links by calling php functions in the
// template
- result = result + "<td><?php genLinks($_SERVER[\"SERVER_NAME\"],\"@buildlabel@\",\"" + aPlatform.getFileName()
+ result = result + "<td><?php genLinks($_SERVER[\"SERVER_NAME\"],\"${buildId}\",\"" + aPlatform.getFileName()
+ "\"); ?></td>\n";
result = result + "</tr>\n";
return result;
}
- // private void mailResults() {
- // //send a different message for the following cases:
- // //build is not tested at all
- // //build is tested, tests have not run
- // //build is tested, tests have run with error and or failures
- // //build is tested, tests have run with no errors or failures
- // try {
- // mailer = new Mailer();
- // } catch (NoClassDefFoundError e) {
- // return;
- // }
- // String buildLabel = mailer.getBuildProperties().getBuildLabel();
- // String httpUrl = mailer.getBuildProperties().getHttpUrl()+"/"+buildLabel;
- // // String ftpUrl =
- // mailer.getBuildProperties().getftpUrl()+"/"+buildLabel;
- //
- // String subject = "Build is complete. ";
- //
- // String downloadLinks="\n\nHTTP Download:\n\n\t"+httpUrl+" \n\n";
- // /* downloadLinks=downloadLinks.concat("FTP Download:\n\n");
- // downloadLinks=downloadLinks.concat("\tuser: anonymous\n\tpassword: (e-mail address or leave blank)\n\tserver: download.eclipse.org\n\tcd to directory: "+buildLabel);
- // downloadLinks=downloadLinks.concat("\n\n\tor");
- // downloadLinks=downloadLinks.concat("\n\n\t"+ftpUrl);*/
- //
- // //provide http links
- // String message = "The build is complete."+downloadLinks;
- //
- // if (testsRan()) {
- // subject = "Automated JUnit testing complete. ";
- // message = "Automated JUnit testing is complete. ";
- // subject =
- // subject.concat(
- // (getTestResultsWithProblems().endsWith("\n"))
- // ? "All tests pass."
- // : "Test failures/errors occurred.");
- // message =
- // message.concat(
- // (getTestResultsWithProblems().endsWith("\n"))
- // ? "All tests pass."
- // : "Test failures/errors occurred in the following: "
- // + getTestResultsWithProblems())+downloadLinks;
- // } else if (isBuildTested() && (!buildType.equals("N"))) {
- // subject = subject.concat("Automated JUnit testing is starting.");
- // message = "The " + subject+downloadLinks;
- // }
- //
- // if (subject.endsWith("Test failures/errors occurred."))
- // mailer.sendMessage(subject, message);
- // else if (!buildType.equals("N"))
- // mailer.sendMessage(subject, message);
- //
- // }
-
/**
* @param buildType
*/
diff --git a/bundles/org.eclipse.build.tools/src/org/eclipse/releng/generators/TestResultsGenerator.java b/bundles/org.eclipse.build.tools/src/org/eclipse/releng/generators/TestResultsGenerator.java
index 1b56d30..7e758b7 100644
--- a/bundles/org.eclipse.build.tools/src/org/eclipse/releng/generators/TestResultsGenerator.java
+++ b/bundles/org.eclipse.build.tools/src/org/eclipse/releng/generators/TestResultsGenerator.java
@@ -161,7 +161,7 @@
public static void main(final String[] args) {
final TestResultsGenerator test = new TestResultsGenerator();
test.setDropTokenList("%equinox%,%framework%,%extrabundles%,%other%,%incubator%,%provisioning%,%launchers%,%osgistarterkits%");
- test.setPlatformIdentifierToken("%platform%");
+ //test.setPlatformIdentifierToken("%platform%");
test.getDropTokensFromList(test.dropTokenList);
test.setIsBuildTested(false);
test.setXmlDirectoryName("/home/shared/eclipse/eclipse4I/siteDir/equinox/drops/I20120514-1900/testresults/xml");
@@ -720,19 +720,6 @@
return htmlDirectoryName;
}
- public String getPlatformIdentifierToken() {
- return platformIdentifierToken;
- }
-
- protected void getPlatformSpecsFromList(final String list) {
- final StringTokenizer tokenizer = new StringTokenizer(list, ",");
- platformSpecs = new Vector();
-
- while (tokenizer.hasMoreTokens()) {
- platformSpecs.add(tokenizer.nextToken());
- }
- }
-
/*
* Return the HTML mark-up to use in the "status" column.
*/
@@ -1044,7 +1031,7 @@
result = result + "<td>All " + name + "</td>";
// generate http, md5 and sha1 links by calling php functions in
// the template
- result = result + "<td><?php genLinks($_SERVER[\"SERVER_NAME\"],\"@buildlabel@\",\"" + platforms[i].getFileName()
+ result = result + "<td><?php genLinks($_SERVER[\"SERVER_NAME\"],\"${buildId}\",\"" + platforms[i].getFileName()
+ "\"); ?></td>\n";
result = result + "</tr>\n";
}
