Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid Williams2014-03-17 08:38:20 -0400
committerDavid Williams2014-03-17 08:38:20 -0400
commit5e1a4f8673213544a0389125f0968b040ecd9938 (patch)
treeddfdcff4c766d154321e1c324e1ee7b9d10fdf7f
parent2bc04fbf36efc25a36370eef88f67d8a1d83502f (diff)
downloadeclipse.platform.releng.aggregator-david_williams/BETA_JAVA8_LUNA.tar.gz
eclipse.platform.releng.aggregator-david_williams/BETA_JAVA8_LUNA.tar.xz
eclipse.platform.releng.aggregator-david_williams/BETA_JAVA8_LUNA.zip
[releng] first steps of improving labels.david_williams/BETA_JAVA8_LUNA
writing relevent PHP variables
-rw-r--r--eclipse.platform.releng.tychoeclipsebuilder/eclipse-junit-tests/src/main/scripts/test.xml30
-rw-r--r--production/testScripts/configuration/sdk.tests/testScripts/test.xml30
2 files changed, 30 insertions, 30 deletions
diff --git a/eclipse.platform.releng.tychoeclipsebuilder/eclipse-junit-tests/src/main/scripts/test.xml b/eclipse.platform.releng.tychoeclipsebuilder/eclipse-junit-tests/src/main/scripts/test.xml
index 42537aeb..ef3ac7a0 100644
--- a/eclipse.platform.releng.tychoeclipsebuilder/eclipse-junit-tests/src/main/scripts/test.xml
+++ b/eclipse.platform.releng.tychoeclipsebuilder/eclipse-junit-tests/src/main/scripts/test.xml
@@ -6,13 +6,13 @@
<!--
Should be able to record "hudson slave" as part of test results?
- Or, if that's not defined, perhaps simply "hostname"?
+ Or, if that's not defined, perhaps simply "hostname"?
-->
<property environment="env" />
<!--properties file containing the build information-->
<property file="label.properties" />
- <!--
+ <!--
properties file containing the plugin directory name including version number,
and list of required test plug-ins expressed as command-line argument to unzip executable.
Generated and packaged at build time.
@@ -1460,7 +1460,7 @@
</target>
- <!-- this group is "platform tests" that are Long Running
+ <!-- this group is "platform tests" that are Long Running
(or, perhaps hang?, during performance tests.
-->
<target name="platformLR">
@@ -1553,9 +1553,9 @@
<markTime msg="${message}" />
</target>
- <!--
- Prints properties in "PHP form" to use on test results summary,
- to be sure accurate and meaningful.
+ <!--
+ Prints properties in "PHP form" to use on test results summary,
+ to be sure accurate and meaningful.
-->
<target name="printMainProperties"
depends="setJVMProperties"
@@ -1569,28 +1569,28 @@
var sArray = pattern.exec(javaVersion);
// sArray 0 is "whole match"
- // for safety from programing errors, we'll check that there is
- // something in '1'.
+ // for safety from programing errors, we'll check that there is
+ // something in '1'.
var length = sArray.length;
- if (length > 1)
+ if (length > 1)
{
project.setProperty("javaMajorVersion", sArray[1]);
- }
- else
+ }
+ else
{
project.setProperty("javaMajorVersion", "0");
}
</script>
-
+
<!-- properties to use on test results summary, to be sure accurate -->
<property
name="platformResults"
- value="${results}/${os}.${ws}.${arch}_${javaMajorVersion}" />
+ value="${results}/${os}.${ws}.${arch}-${javaMajorVersion}" />
<mkdir dir="${platformResults}" />
<property name="phpPropertyFile" value="${platformResults}/testProperties.php"/>
<!-- first write don't append -->
- <echo
+ <echo
message="&lt;?php${EOL}"
append="false"
file="${phpPropertyFile}" />
@@ -1669,7 +1669,7 @@
message="HUDSON_WORKSPACE=${env.WORKSPACE}${EOL}"
append="true"
file="${phpPropertyFile}" />
-
+
<property name="printedMainProperties" value="true" />
</target>
diff --git a/production/testScripts/configuration/sdk.tests/testScripts/test.xml b/production/testScripts/configuration/sdk.tests/testScripts/test.xml
index 42537aeb..ef3ac7a0 100644
--- a/production/testScripts/configuration/sdk.tests/testScripts/test.xml
+++ b/production/testScripts/configuration/sdk.tests/testScripts/test.xml
@@ -6,13 +6,13 @@
<!--
Should be able to record "hudson slave" as part of test results?
- Or, if that's not defined, perhaps simply "hostname"?
+ Or, if that's not defined, perhaps simply "hostname"?
-->
<property environment="env" />
<!--properties file containing the build information-->
<property file="label.properties" />
- <!--
+ <!--
properties file containing the plugin directory name including version number,
and list of required test plug-ins expressed as command-line argument to unzip executable.
Generated and packaged at build time.
@@ -1460,7 +1460,7 @@
</target>
- <!-- this group is "platform tests" that are Long Running
+ <!-- this group is "platform tests" that are Long Running
(or, perhaps hang?, during performance tests.
-->
<target name="platformLR">
@@ -1553,9 +1553,9 @@
<markTime msg="${message}" />
</target>
- <!--
- Prints properties in "PHP form" to use on test results summary,
- to be sure accurate and meaningful.
+ <!--
+ Prints properties in "PHP form" to use on test results summary,
+ to be sure accurate and meaningful.
-->
<target name="printMainProperties"
depends="setJVMProperties"
@@ -1569,28 +1569,28 @@
var sArray = pattern.exec(javaVersion);
// sArray 0 is "whole match"
- // for safety from programing errors, we'll check that there is
- // something in '1'.
+ // for safety from programing errors, we'll check that there is
+ // something in '1'.
var length = sArray.length;
- if (length > 1)
+ if (length > 1)
{
project.setProperty("javaMajorVersion", sArray[1]);
- }
- else
+ }
+ else
{
project.setProperty("javaMajorVersion", "0");
}
</script>
-
+
<!-- properties to use on test results summary, to be sure accurate -->
<property
name="platformResults"
- value="${results}/${os}.${ws}.${arch}_${javaMajorVersion}" />
+ value="${results}/${os}.${ws}.${arch}-${javaMajorVersion}" />
<mkdir dir="${platformResults}" />
<property name="phpPropertyFile" value="${platformResults}/testProperties.php"/>
<!-- first write don't append -->
- <echo
+ <echo
message="&lt;?php${EOL}"
append="false"
file="${phpPropertyFile}" />
@@ -1669,7 +1669,7 @@
message="HUDSON_WORKSPACE=${env.WORKSPACE}${EOL}"
append="true"
file="${phpPropertyFile}" />
-
+
<property name="printedMainProperties" value="true" />
</target>

Back to the top