Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid Williams2013-06-23 12:32:21 -0400
committerDavid Williams2013-06-23 12:32:21 -0400
commit17d786204cf3b15ab21985203ada2c5d96814109 (patch)
tree6e1d63b0c251bd8e71b169b5a0e4d037a5d05d1c
parent369b3cee7149d538c3a3a564a2b5dbe57ac0eb64 (diff)
downloadeclipse.platform.releng.aggregator-17d786204cf3b15ab21985203ada2c5d96814109.tar.gz
eclipse.platform.releng.aggregator-17d786204cf3b15ab21985203ada2c5d96814109.tar.xz
eclipse.platform.releng.aggregator-17d786204cf3b15ab21985203ada2c5d96814109.zip
[releng] test resource capturing
-rw-r--r--eclipse-platform-parent/pom.xml2
-rw-r--r--eclipse.platform.releng.tychoeclipsebuilder/eclipse-junit-tests/src/main/scripts/JUNIT.XSL108
-rw-r--r--production/master-build.sh17
3 files changed, 77 insertions, 50 deletions
diff --git a/eclipse-platform-parent/pom.xml b/eclipse-platform-parent/pom.xml
index de8682c5..d5b8395d 100644
--- a/eclipse-platform-parent/pom.xml
+++ b/eclipse-platform-parent/pom.xml
@@ -613,7 +613,7 @@
<repository>
<id>eclipse</id>
<layout>p2</layout>
- <url>http://download.eclipse.org/releases/juno</url>
+ <url>http://download.eclipse.org/eclipse/updates/4.3/R-4.3-201306052000/</url>
</repository>
</repositories>
<!-- this is to fix some lucene 3.x compatibility issue -->
diff --git a/eclipse.platform.releng.tychoeclipsebuilder/eclipse-junit-tests/src/main/scripts/JUNIT.XSL b/eclipse.platform.releng.tychoeclipsebuilder/eclipse-junit-tests/src/main/scripts/JUNIT.XSL
index 12e0e3e3..c23a4a39 100644
--- a/eclipse.platform.releng.tychoeclipsebuilder/eclipse-junit-tests/src/main/scripts/JUNIT.XSL
+++ b/eclipse.platform.releng.tychoeclipsebuilder/eclipse-junit-tests/src/main/scripts/JUNIT.XSL
@@ -30,10 +30,14 @@
It creates a non-framed report that can be useful to send via
e-mail or such.
-
- NOTE: This file was copied from ant-junit.jar 1.8.4 (plus fixes from https://issues.apache.org/bugzilla/show_bug.cgi?id=54641 and https://issues.apache.org/bugzilla/show_bug.cgi?id=54180 )
+
+ NOTE: This file was copied from ant-junit.jar 1.8.4
/org/apache/tools/ant/taskdefs/optional/junit/xsl/junit-noframes.xsl
- and should be compared to similar files when ant version changes.
+ and should be compared to similar files when the Ant version changes.
+ Additional fixes:
+ https://issues.apache.org/bugzilla/show_bug.cgi?id=54641
+ https://issues.apache.org/bugzilla/show_bug.cgi?id=54180
+ https://bugs.eclipse.org/bugs/show_bug.cgi?id=410484
-->
<xsl:template match="testsuites">
@@ -141,46 +145,67 @@
if (typeof(e) == "undefined") {
e = event;
}
- if (e && e.ctrlKey && e.keyCode == 190 /*Ctrl+.*/) {
- if (typeof(document.getElementsByClassName) == "undefined") {
- document.getElementsByClassName = function (className) {
- var trs = document.getElementsByTagName("tr");
- var res = new Array();
- for (i = 0; i < trs.length; i++) {
- var tr = trs[i];
- var cls = tr.className;
- if (cls == className) {
- res.push(tr);
- }
+ if (e && e.ctrlKey) {
+ if (e.keyCode == 188 /*Ctrl+,*/) {
+ jumpToNextError(false);
+ } else if (e.keyCode == 190 /*Ctrl+.*/) {
+ jumpToNextError(true);
+ }
+ }
+ }
+
+ function jumpToNextError(forward) {
+ if (typeof(document.getElementsByClassName) == "undefined") {
+ document.getElementsByClassName = function (className) {
+ var trs = document.getElementsByTagName("tr");
+ var res = new Array();
+ for (i = 0; i < trs.length; i++) {
+ var tr = trs[i];
+ var cls = tr.className;
+ if (cls == className) {
+ res.push(tr);
}
- return res;
}
+ return res;
}
- var windowY = typeof(window.scrollY) != "undefined" ? window.scrollY : document.body.scrollTop;
- windowY++; // want to jump to the next
- var targetY = Number.MAX_VALUE;
- var target;
- var errs = document.getElementsByClassName("Error");
- for (var i = 0; i < errs.length; i++) {
- var elt = errs[i];
- if (elt.childNodes.length > 2) {
- var status = elt.childNodes[2].firstChild.nodeValue;
- if (status != "Error" && status != "Failure")
- continue; // only stop in test results, not in summary header
- }
- var y = findTop(elt);
- if (y > windowY && y < targetY) {
- target = elt;
- targetY = y;
- }
+ }
+ var windowY = typeof(window.scrollY) != "undefined" ? window.scrollY : document.body.scrollTop;
+ if (forward) { // want to jump to the next/prev
+ windowY++;
+ } else {
+ windowY--;
+ }
+ var targetY = forward ? Number.MAX_VALUE : Number.MIN_VALUE;
+ var target;
+ var errs = document.getElementsByClassName("Error");
+ for (var i = 0; i < errs.length; i++) {
+ var elt = errs[i];
+ var tds = elt.getElementsByTagName("td");
+ if (tds.length >= 2) {
+ var status = tds[1].firstChild.nodeValue;
+ if (status != "Error" && status != "Failure")
+ continue; // only stop in test results, not in summary header
}
- if (target) {
- target.scrollIntoView();
+ var y = findTop(elt);
+ if (forward) {
+ if (y > windowY && y < targetY) {
+ target = elt;
+ targetY = y;
+ }
+ } else {
+ if (y < windowY && y > targetY) {
+ target = elt;
+ targetY = y;
+ }
}
-
- return false;
}
+ if (target) {
+ target.scrollIntoView();
+ }
+
+ return false;
}
+
document.onkeydown = keyHandler;
]]>
</script>
@@ -372,9 +397,13 @@
<!-- Page HEADER -->
<xsl:template name="pageHeader">
<h1><xsl:value-of select="$TITLE"/></h1>
+ <div style="position:fixed; top:8px; right:8px; _position:absolute; _top:expression(eval(document.body.scrollTop + 8));">
+ <button title="Scroll to previous failure/error (Ctrl+,)" onclick="javascript:jumpToNextError(false);">&#x25B2;</button>
+ <button title="Scroll to next failure/error (Ctrl+.)" onclick="javascript:jumpToNextError(true );">&#x25BC;</button>
+ </div>
<table width="100%">
<tr>
- <td align="left">(Press Ctrl+. to scroll to the next problem.)</td>
+ <td align="left"></td>
<td align="right">Designed for use with <a href='http://www.junit.org'>JUnit</a> and <a href='http://ant.apache.org/ant'>Ant</a>.</td>
</tr>
</table>
@@ -448,7 +477,10 @@
<xsl:when test="failure | error">Error</xsl:when>
</xsl:choose>
</xsl:attribute>
- <td><xsl:value-of select="@name"/></td>
+ <td>
+ <xsl:attribute name="title"><xsl:value-of select="@classname"/></xsl:attribute>
+ <xsl:value-of select="@name"/>
+ </td>
<xsl:choose>
<xsl:when test="failure">
<td>Failure</td>
diff --git a/production/master-build.sh b/production/master-build.sh
index f6b06a0f..2cc36cbe 100644
--- a/production/master-build.sh
+++ b/production/master-build.sh
@@ -167,19 +167,14 @@ else
$SCRIPT_PATH/update-build-input.sh $BUILD_ENV_FILE 2>&1 | tee $logsDirectory/mb020_update-build-input_output.txt
checkForErrorExit $? "Error occurred while updating build input"
- if [[ $BUILD_ID =~ [IN] ]]
- then
+ #if [[ $BUILD_ID =~ [IN] ]]
+ #then
# temp hack for bug 398141 and others
# apply the pre-created patch from tempPatches
- echo "INFO: apply temp patch"
- echo "DEBUG: aggDir: $aggDir"
- echo "DEBUG: pwd: $PWD"
- #patch -p1 --backup -d $aggDir/rt.equinox.bundles/bundles -i $aggDir/tempPatches/sbep2.patch
- #patch -p1 --backup -d $aggDir/eclipse.platform.ui/features -i $aggDir/tempPatches/e4rcpsource.patch
- #patch -p1 --backup -d $aggDir/rt.equinox.framework/bundles -i $aggDir/tempPatches/ppc.patch
- patch -p1 --backup -d $aggDir/eclipse.platform.ui/bundles -i $aggDir/production/tempPatches/jface.patch
- checkForErrorExit $? "Error occurred applying patch"
- fi
+ #echo "INFO: apply temp patch, if any"
+ #patch -p1 --backup -d $aggDir/eclipse.platform.ui/bundles -i $aggDir/production/tempPatches/jface.patch
+ #checkForErrorExit $? "Error occurred applying patch"
+ #fi
# We always make tag commits, if build successful or not, but don't push
# back to origin if doing N builds or test builds.

Back to the top