Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid Williams2015-03-15 03:51:14 +0000
committerDavid Williams2015-03-15 03:51:14 +0000
commitfa936db80c92acaf46bf00fb399143e673a41fdd (patch)
treec870d91c1f30ca89135520001d1756d92edea3fd
parent2726c28467b94ceccf9945ae0922f9e19fc498ac (diff)
downloadeclipse.platform.releng.aggregator-david_williams/macapp.tar.gz
eclipse.platform.releng.aggregator-david_williams/macapp.tar.xz
eclipse.platform.releng.aggregator-david_williams/macapp.zip
[releng] Synch master with macapp branch, in prep of using Tychodavid_williams/macapp
23-SNAPSHOT.
-rw-r--r--eclipse-platform-parent/pom.xml56
-rw-r--r--eclipse.platform.releng.prereqs.sdk/eclipse-sdk-prereqs.target11
-rw-r--r--eclipse.platform.releng.tychoeclipsebuilder/eclipse-junit-tests/src/main/scripts/library.xml6
-rw-r--r--eclipse.platform.releng.tychoeclipsebuilder/eclipse/publishingFiles/templateFiles/buildproperties.phpHoldForLocalTests6
-rwxr-xr-xproduction/build-functions.shsource64
-rw-r--r--production/master-build.sh33
-rwxr-xr-xproduction/sdk/testsummaries/runAntRunner.sh12
-rw-r--r--production/sdk/testsummaries/standardVariables.shsource10
-rw-r--r--production/testScripts/configuration/sdk.tests/testScripts/test.xml16
-rwxr-xr-xproduction/testScripts/test_runTests2.xml.sh1
-rwxr-xr-xproduction/testScripts/updateTestResultsPages.sh1
-rwxr-xr-xscripts/xsl/upVersionParents.sh4
12 files changed, 163 insertions, 57 deletions
diff --git a/eclipse-platform-parent/pom.xml b/eclipse-platform-parent/pom.xml
index 243fb6ecc..d275d6f80 100644
--- a/eclipse-platform-parent/pom.xml
+++ b/eclipse-platform-parent/pom.xml
@@ -21,6 +21,14 @@
<artifactId>eclipse-platform-parent</artifactId>
<version>4.5.0-SNAPSHOT</version>
<packaging>pom</packaging>
+ <!--
+ See maven-enforcer-plugin configuration to actually break the build if
+ run with older maven.
+ prerequisites section is kept for now as even if it doesn't break the build, it
+ is used by other plugins like versions-maven-plugin which check and warn
+ for using plugins with older than they require Maven version.
+ If version number changed in one place, be sure to change in the other.
+ -->
<prerequisites>
<maven>3.1.1</maven>
</prerequisites>
@@ -77,17 +85,18 @@
<ecf-repo.url>http://download.eclipse.org/rt/ecf/3.9.2/site.p2/</ecf-repo.url>
- <!-- using snapshot version for bug 461207 -->
+ <!-- using snapshot repo for Tycho 0.23.0-SNAPSHOT, such as for bug 461207 -->
+ <!-- Does it hurt to always leave snapshot repo here? Even if not used? -->
<tycho-snapshot-repo.url>https://repo.eclipse.org/content/repositories/tycho-snapshots/</tycho-snapshot-repo.url>
- <tycho-repo.url>https://oss.sonatype.org/content/repositories/public/</tycho-repo.url>
+ <tycho-repo.url>https://oss.sonatype.org/content/repositories/public/</tycho-repo.url>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<cbi-jdt-repo.url>https://repo.eclipse.org/content/repositories/eclipse-staging/</cbi-jdt-repo.url>
<cbi-jdt-version>3.11.0.v20150118-1315</cbi-jdt-version>
-
- <!--
- This jetty-version is used by the help system in building the JSPs,
- and should change when ever our "shipped" version of Jetty changes.
+
+ <!--
+ This jetty-version is used by the help system in building the JSPs,
+ and should change when ever our "shipped" version of Jetty changes.
-->
<jetty-version>9.2.5.v20141112</jetty-version>
@@ -337,7 +346,34 @@
</execution>
</executions>
</plugin>
-
+ <plugin>
+ <!--
+ This maven-enforcer-plugin configuration to actually break the build if
+ run with older maven.
+ prerequisites section is kept for now as even if it doesn't break the build, it
+ is used by other plugins like versions-maven-plugin which check and warn
+ for using plugins with older than they require Maven version.
+ If version number changed in one place, be sure to change in the other.
+ -->
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-enforcer-plugin</artifactId>
+ <version>1.4</version>
+ <executions>
+ <execution>
+ <id>enforce-maven</id>
+ <goals>
+ <goal>enforce</goal>
+ </goals>
+ <configuration>
+ <rules>
+ <requireMavenVersion>
+ <version>3.1.1</version>
+ </requireMavenVersion>
+ </rules>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
</plugins>
<pluginManagement>
<plugins>
@@ -371,13 +407,15 @@
<args>-encoding</args>
<args>${project.build.sourceEncoding}</args>
<args>-proceedOnError</args>
- <!--
+ <!-- Use this form, for Tycho 22 or less. -->
<args>-log</args>
<args>${project.build.directory}/@dot.xml</args>
- -->
+
</compilerArgs>
+ <!-- Use this form for Tycho 23 or greater
<log>xml</log>
<logDirectory>${project.build.directory}/compilelogs</logDirectory>
+ -->
<showWarnings>true</showWarnings>
<excludeResources>
<exclude>**/package.html</exclude>
diff --git a/eclipse.platform.releng.prereqs.sdk/eclipse-sdk-prereqs.target b/eclipse.platform.releng.prereqs.sdk/eclipse-sdk-prereqs.target
index dd43a09f5..a00a626f8 100644
--- a/eclipse.platform.releng.prereqs.sdk/eclipse-sdk-prereqs.target
+++ b/eclipse.platform.releng.prereqs.sdk/eclipse-sdk-prereqs.target
@@ -105,6 +105,7 @@
<!-- built but not delivered. See bug 422102 -->
<unit id="org.apache.commons.jxpath" version="1.3.0.v200911051830"/>
+ <unit id="org.apache.commons.jxpath.source" version="1.3.0.v200911051830"/>
<repository location="http://download.eclipse.org/tools/orbit/downloads/drops/S20150202203538/repository/"/>
</location>
@@ -169,7 +170,15 @@
<repository location="http://download.eclipse.org/egit/updates-3.4"/>
</location>
- <!-- uncomment 'eclipse_home' location, with text editor, for use in Eclipse IDE
+ <!-- For org.eclipse.ui.tools -->
+ <location includeAllPlatforms="true" includeMode="slicer" type="InstallableUnit">
+ <unit id="org.eclipse.emf.edit" version="2.11.0.v20150123-0357"/>
+ <unit id="org.eclipse.emf.databinding" version="1.3.0.v20150123-0357"/>
+ <unit id="org.eclipse.emf.databinding.edit" version="1.3.0.v20150123-0357"/>
+ <repository location="http://download.eclipse.org/modeling/emf/emf/updates/2.11milestones/core/S201501230357" />
+ </location>
+
+ <!-- uncomment 'eclipse_home' location, with text editor, for use in Eclipse IDE
<location path="${eclipse_home}" type="Profile"/>
-->
diff --git a/eclipse.platform.releng.tychoeclipsebuilder/eclipse-junit-tests/src/main/scripts/library.xml b/eclipse.platform.releng.tychoeclipsebuilder/eclipse-junit-tests/src/main/scripts/library.xml
index 75e47c27a..fd343d5a6 100644
--- a/eclipse.platform.releng.tychoeclipsebuilder/eclipse-junit-tests/src/main/scripts/library.xml
+++ b/eclipse.platform.releng.tychoeclipsebuilder/eclipse-junit-tests/src/main/scripts/library.xml
@@ -202,7 +202,7 @@
<!--default vm args Note: the goal is to use same values as what would be in eclipse.ini -->
<condition
property="frameworkvmargs"
- value=" -Xms40m -Xmx1024m -XX:MaxPermSize=256m ${envantopts}">
+ value=" -Xms256m -Xmx1024m -XX:MaxPermSize=256m ${envantopts}">
<os family="windows" />
</condition>
<!--
@@ -211,12 +211,12 @@
-->
<condition
property="frameworkvmargs"
- value=" -XstartOnFirstThread -Xms40m -Xmx1024m -XX:MaxPermSize=256m ${envantopts}">
+ value=" -XstartOnFirstThread -Xms256m -Xmx1024m -XX:MaxPermSize=256m ${envantopts}">
<os family="mac" />
</condition>
<property
name="frameworkvmargs"
- value=" -Xms40m -Xmx1024m -XX:MaxPermSize=256m ${envantopts}" />
+ value=" -Xms256m -Xmx1024m -XX:MaxPermSize=256m ${envantopts}" />
<condition
property="loglocation"
diff --git a/eclipse.platform.releng.tychoeclipsebuilder/eclipse/publishingFiles/templateFiles/buildproperties.phpHoldForLocalTests b/eclipse.platform.releng.tychoeclipsebuilder/eclipse/publishingFiles/templateFiles/buildproperties.phpHoldForLocalTests
index ca411f794..668ad46db 100644
--- a/eclipse.platform.releng.tychoeclipsebuilder/eclipse/publishingFiles/templateFiles/buildproperties.phpHoldForLocalTests
+++ b/eclipse.platform.releng.tychoeclipsebuilder/eclipse/publishingFiles/templateFiles/buildproperties.phpHoldForLocalTests
@@ -9,7 +9,7 @@
// a recent copy. This was copied circa July 8, 2014.
// properties written for N20140707-2000
-$PATH = "/shared/common/jdk1.8.0_x64-latest/bin:/shared/common/apache-maven-3.1.1/bin:/shared/common/apache-ant-1.9.2/bin:/usr/local/bin:/usr/bin:/bin:/opt/buildhomes/e4Build/bin";
+$PATH = "/shared/common/jdk1.7.0-latest/bin:/shared/common/apache-maven-3.1.1/bin:/shared/common/apache-ant-1.9.2/bin:/usr/local/bin:/usr/bin:/bin:/opt/buildhomes/e4Build/bin";
$INITIAL_ENV_FILE = "/shared/eclipse/builds/4N/production/build_eclipse_org.shsource";
$BUILD_ROOT = "/shared/eclipse/builds/4N";
$BRANCH = "master";
@@ -17,8 +17,8 @@ $STREAM = "4.5.0";
$BUILD_TYPE = "N";
$TIMESTAMP = "20140707-2000";
$TMP_DIR = "/shared/eclipse/builds/4N/tmp";
-$JAVA_HOME = "/shared/common/jdk1.8.0_x64-latest";
-$MAVEN_OPTS = "-Xmx2560m -Djava.io.tmpdir=/shared/eclipse/builds/4N/tmp -Dtycho.localArtifacts=ignore;
+$JAVA_HOME = "/shared/common/jdk1.7.0-latest";
+$MAVEN_OPTS = "-Xmx2560m -XX:MaxPermSize=256M -Djava.io.tmpdir=/shared/eclipse/builds/4N/tmp -Dtycho.localArtifacts=ignore;
$MAVEN_PATH = "/shared/common/apache-maven-3.1.1/bin";
$AGGREGATOR_REPO = "file:///gitroot/platform/eclipse.platform.releng.aggregator.git";
$BASEBUILDER_TAG = "R38M6PlusRC3G";
diff --git a/production/build-functions.shsource b/production/build-functions.shsource
index 234e3bcf6..923fc49cd 100755
--- a/production/build-functions.shsource
+++ b/production/build-functions.shsource
@@ -369,17 +369,18 @@ fn-maven-build-aggregator ()
echo "DEBUG: MARGS: $MARGS"
echo "DEBUG: FORCEQUALIFIERARG: $FORCEQUALIFIERARG"
- # -fail-at-end gives chance for bundles to compile, even after
+ # --fail-at-end gives chance for bundles to compile, even after
# a compile error. Might have to specify --fail-never to see them all? See
# http://www.sonatype.com/books/mvnref-book/reference/running-sect-options.html#running-sect-failure-option
+ # during debugging, sometimes helpful to change to --fail-fast
pushd "$REPO_DIR"
- # lock-snapshots, if not obvious, should only be run occasionally, once ready to "stabilize"
- # mvn versions:lock-snapshots -Dmaven.repo.local=$LOCAL_REPO -Dincludes=org.eclipse.tycho* >${logsDirectory}/lock-snapshots.txt
- # mvn versions:display-plugin-updates -Dmaven.repo.local=$LOCAL_REPO > ${logsDirectory}/display-plugin-updates.txt
- # 'dependency updates' not useful for Tycho, since its "dependencies" are via p2.
- # mvn versions:display-dependency-updates -Dmaven.repo.local=$LOCAL_REPO > ${logsDirectory}/display-dependency-updates.txt
- # mvn versions:display-property-updates -Dmaven.repo.local=$LOCAL_REPO > ${logsDirectory}/display-property-updates.txt
- mvn $MARGS --fail-fast -V ${ALT_POM_FILE} \
+ # lock-snapshots, if not obvious, should only be run occasionally, once ready to "stabilize"
+ # mvn versions:lock-snapshots -Dmaven.repo.local=$LOCAL_REPO -Dincludes=org.eclipse.tycho* >${logsDirectory}/lock-snapshots.txt
+ # mvn versions:display-plugin-updates -Dmaven.repo.local=$LOCAL_REPO > ${logsDirectory}/display-plugin-updates.txt
+ # 'dependency updates' not useful for Tycho, since its "dependencies" are via p2.
+ # mvn versions:display-dependency-updates -Dmaven.repo.local=$LOCAL_REPO > ${logsDirectory}/display-dependency-updates.txt
+ # mvn versions:display-property-updates -Dmaven.repo.local=$LOCAL_REPO > ${logsDirectory}/display-property-updates.txt
+ mvn $MARGS --fail-fast -V ${ALT_POM_FILE} \
clean verify \
-DskipTests=true \
-Dmaven.repo.local=$LOCAL_REPO $CBI_JDT_REPO_URL_ARG $CBI_JDT_VERSION_ARG \
@@ -851,6 +852,51 @@ fn-gather-compile-logs ()
BUILD_DIR="$1"; shift
if [[ -d "$REPO_DIR" ]]
then
+ mkdir -p "$BUILD_DIR"/compilelogs/plugins
+ pushd "$REPO_DIR"
+ for dot in $( find * -name "@dot.xml" ); do
+ targetDir=$( dirname "$dot" )
+ echo "Processing $dot in $targetDir"
+ if [ ! -r "$targetDir"/MANIFEST.MF ]; then
+ echo "**Failed to process $dot in $targetDir. Likely compile error. Will try source MANIFEST.MF in directory containing target."
+ targetDir=$( dirname "${targetDir}" )
+ if [ ! -r "$targetDir"/META-INF/MANIFEST.MF ]
+ then
+ echo "**Failed to process $dot in $targetDir."
+ else
+ BUNDLE_ID=$( grep Bundle-SymbolicName "$targetDir"/META-INF/MANIFEST.MF | cut -f2 -d" " | cut -f1 -d\; | tr -d '\f\r\n\t' )
+ BUNDLE_VERSION=$( grep Bundle-Version "$targetDir"/META-INF/MANIFEST.MF | cut -f2 -d" " | tr -d '\f\r\n\t' )
+ mkdir "$BUILD_DIR"/compilelogs/plugins/${BUNDLE_ID}_${BUNDLE_VERSION}
+ cp "$dot" "$BUILD_DIR"/compilelogs/plugins/${BUNDLE_ID}_${BUNDLE_VERSION}
+ fi
+ else
+ BUNDLE_ID=$( grep Bundle-SymbolicName "$targetDir"/MANIFEST.MF | cut -f2 -d" " | cut -f1 -d\; | tr -d '\f\r\n\t' )
+ BUNDLE_VERSION=$( grep Bundle-Version "$targetDir"/MANIFEST.MF | cut -f2 -d" " | tr -d '\f\r\n\t' )
+ mkdir "$BUILD_DIR"/compilelogs/plugins/${BUNDLE_ID}_${BUNDLE_VERSION}
+ cp "$dot" "$BUILD_DIR"/compilelogs/plugins/${BUNDLE_ID}_${BUNDLE_VERSION}
+ fi
+ done
+ popd
+ else
+ echo "[ERROR] $REPO_DIR did not exist in fn-gather-compile-logs"
+ fi
+}
+
+# USAGE: fn-gather-23-compile-logs BUILD_ID REPO_DIR BUILD_DIR
+# This method for use when using Tycho 0.23.0 or greater, due to
+# fix for multi-jar bundles.
+# BUILD_ID: I20121116-0700
+# REPO_DIR: /shared/eclipse/builds/R4_2_maintenance/gitCache/eclipse.platform.releng.aggregator
+# BUILD_DIR: /shared/eclipse/builds/R4_2_maintenance/dirs/M20121120-1747
+fn-gather-compile-logs ()
+{
+ checkNArgs $# 3
+ if [[ $? != 0 ]]; then return 1; fi
+ BUILD_ID="$1"; shift
+ REPO_DIR="$1"; shift
+ BUILD_DIR="$1"; shift
+ if [[ -d "$REPO_DIR" ]]
+ then
COLLECTED_LOGS_DIR="${BUILD_DIR}/compilelogs/plugins"
mkdir -p "${COLLECTED_LOGS_DIR}"
pushd "$REPO_DIR"
@@ -875,7 +921,7 @@ fn-gather-compile-logs ()
BUNDLE_ID=$( grep Bundle-SymbolicName "$targetDir"/MANIFEST.MF | cut -f2 -d" " | cut -f1 -d\; | tr -d '\f\r\n\t' )
BUNDLE_VERSION=$( grep Bundle-Version "$targetDir"/MANIFEST.MF | cut -f2 -d" " | tr -d '\f\r\n\t' )
# directory may not be "new", since we now collect @dot.xml, plus nested jar compile logs, of the form <jarName>.jar.xml
- # as well as handy for "re-running"
+ # as well as handy for "re-running"
mkdir -p "${COLLECTED_LOGS_DIR}/${BUNDLE_ID}_${BUNDLE_VERSION}"
# All logs should be directly under $log, but ... will specify -r in case not.
# Remember to remove 'v' after confirmed working
diff --git a/production/master-build.sh b/production/master-build.sh
index afd22a2c0..968cd3775 100644
--- a/production/master-build.sh
+++ b/production/master-build.sh
@@ -102,6 +102,8 @@ export BUILD_ENV_FILE=${buildDirectory}/buildproperties.shsource
export BUILD_ENV_FILE_PHP=${buildDirectory}/buildproperties.php
export BUILD_ENV_FILE_PROP=${buildDirectory}/buildproperties.properties
+# initially, for some reason, when "patching Tycho" I *had* to set
+# local repo to the .m2/repository. (bug 461718)
export LOCAL_REPO="${BUILD_ROOT}/localMavenRepo"
#export LOCAL_REPO="${HOME}/.m2/repository"
@@ -287,16 +289,20 @@ else
echo "# " >> ${logsDirectory}/relengdirectory.txt
popd
- echo "About to patch Tycho. LOCAL_REPO: ${LOCAL_REPO}"
- ${SCRIPT_PATH}/buildTycho.sh 2>&1 | tee ${logsDirectory}/tycho23.log.txt
- rc=$?
- echo "buildTycho returned $?"
- if [[ $rc != 0 ]]
+ if [[ "true" == "${PATCH_TYCHO}" ]]
then
- echo "[ERROR] buildTycho.sh returned error code: $rc"
- exit $rc
+ echo "About to patch Tycho. LOCAL_REPO: ${LOCAL_REPO}"
+ ${SCRIPT_PATH}/buildTycho.sh 2>&1 | tee ${logsDirectory}/tycho23.log.txt
+ rc=$?
+ echo "buildTycho returned $rc"
+ if [[ $rc != 0 ]]
+ then
+ echo "[ERROR] buildTycho.sh returned error code: $rc"
+ exit $rc
+ fi
fi
- if [[ "true" == "${PATCHSWT}" ]]
+
+ if [[ "true" == "${PATCH_SWT}" ]]
then
echo "About to patchSWT"
${SCRIPT_PATH}/patchSWT.sh
@@ -308,7 +314,13 @@ else
exit $rc
fi
fi
- #$SCRIPT_PATH/pom-version-updater.sh $BUILD_ENV_FILE 2>&1 | tee ${POM_VERSION_UPDATE_BUILD_LOG}
+
+ if [[ "true" == "${USING_TYCHO_SNAPSHOT}" || "true" == "${PATCH_TYCHO}" ]]
+ then
+ echo "[WARNING] Did not run pom-version-updater due to other variable settings"
+ else
+ $SCRIPT_PATH/pom-version-updater.sh $BUILD_ENV_FILE 2>&1 | tee ${POM_VERSION_UPDATE_BUILD_LOG}
+ fi
# if file exists, pom update failed
if [[ -f "${buildDirectory}/buildFailed-pom-version-updater" ]]
then
@@ -318,7 +330,8 @@ else
BUILD_FAILED=${POM_VERSION_UPDATE_BUILD_LOG}
fn-write-property BUILD_FAILED
else
- # if updater failed, something fairly large is wrong, so no need to compile
+ # if updater failed, something fairly large is wrong, so no need to compile,
+ # else, we compile - build here.
$SCRIPT_PATH/run-maven-build.sh $BUILD_ENV_FILE 2>&1 | tee ${RUN_MAVEN_BUILD_LOG}
# if file exists, then run maven build failed.
if [[ -f "${buildDirectory}/buildFailed-run-maven-build" ]]
diff --git a/production/sdk/testsummaries/runAntRunner.sh b/production/sdk/testsummaries/runAntRunner.sh
index 36a5195c0..d2841592f 100755
--- a/production/sdk/testsummaries/runAntRunner.sh
+++ b/production/sdk/testsummaries/runAntRunner.sh
@@ -25,13 +25,13 @@ then
exit 1
fi
-# specify devworkspace and JRE to use to runEclipse
-# remember, we want to use Java 5 for processing artifacts.
+# specify devworkspace and JRE to use to runEclipse.
+# Historically, we wanted to use Java 5 for processing artifacts.
# Ideally same one used to pre-condition (normalize, -repack)
-# the jars in the first place.
-#JAVA_5_HOME=${JAVA_5_HOME:-/home/shared/orbit/apps/ibm-java2-i386-50/jre}
-#JAVA_5_HOME=${JAVA_5_HOME:-${HOME}/jdks/ibm-java2-x86_64-50}
-JAVA_6_HOME=${JAVA_6_HOME:-/shared/common/jdk-1.6.0_26.x86_64}
+# the jars in the first place since only version that is fully forward
+# compatible.
+JAVA_5_HOME=${JAVA_5_HOME:-/shared/common/jdk1.5.0-latest}
+JAVA_6_HOME=${JAVA_6_HOME:-/shared/common/jdk1.6.0-latest}
JAVA_7_HOME=${JAVA_7_HOME:-/shared/common/jdk1.7.0-latest}
JAVA_8_HOME=${JAVA_8_HOME:-/shared/common/jdk1.8.0_x64-latest}
diff --git a/production/sdk/testsummaries/standardVariables.shsource b/production/sdk/testsummaries/standardVariables.shsource
index a2498be3a..5880eb9cf 100644
--- a/production/sdk/testsummaries/standardVariables.shsource
+++ b/production/sdk/testsummaries/standardVariables.shsource
@@ -23,12 +23,12 @@ echo "ERROR: builder scripts was not an existing directory as expected: ${ECLIPS
exit 1
fi
-# specify devworkspace and JRE to use to runEclipse
-# remember, we want to use Java 5 for processing artifacts.
+# specify devworkspace and JRE to use to runEclipse.
+# Historically, we wanted to use Java 5 for processing artifacts.
# Ideally same one used to pre-condition (normalize, -repack)
-# the jars in the first place.
-#JAVA_5_HOME=${JAVA_5_HOME:-/home/shared/orbit/apps/ibm-java2-i386-50/jre}
-#JAVA_5_HOME=${JAVA_5_HOME:-${HOME}/jdks/ibm-java2-x86_64-50}
+# the jars in the first place since only version that is fully forward
+# compatible.
+JAVA_5_HOME=${JAVA_5_HOME:-/shared/common/jdk1.5.0-latest}
JAVA_6_HOME=${JAVA_6_HOME:-/shared/common/jdk-1.6.0_26.x86_64}
JAVA_7_HOME=${JAVA_7_HOME:-/shared/common/jdk1.7.0-latest}
JAVA_8_HOME=${JAVA_8_HOME:-/shared/common/jdk1.8.0_x64-latest}
diff --git a/production/testScripts/configuration/sdk.tests/testScripts/test.xml b/production/testScripts/configuration/sdk.tests/testScripts/test.xml
index 8bf4dcaec..f844f92d3 100644
--- a/production/testScripts/configuration/sdk.tests/testScripts/test.xml
+++ b/production/testScripts/configuration/sdk.tests/testScripts/test.xml
@@ -1378,14 +1378,14 @@
Or, else will take large number of "baselines" averaged? -->
<condition
property="eclipse.perf.config"
- value="build=${baselinePerfAltVersion};config=${testedPlatformConfig};jvm=${javaMajorVersion}">
- <istrue value="${baselinePerfAlt}"/>
+ value="build=${baselinePerfAltVersion};config=${testedPlatformConfig};jvm=${javaMajorVersion}">
+ <istrue value="${baselinePerfAlt}" />
</condition>
<condition
property="eclipse.perf.config"
- value="build=${baselinePerfVersion};config=${testedPlatformConfig};jvm=${javaMajorVersion}"
- else="build=${buildId};config=${testedPlatformConfig};jvm=${javaMajorVersion}">
- <istrue value="${baselinePerf}"/>
+ value="build=${baselinePerfVersion};config=${testedPlatformConfig};jvm=${javaMajorVersion}"
+ else="build=${buildId};config=${testedPlatformConfig};jvm=${javaMajorVersion}">
+ <istrue value="${baselinePerf}" />
</condition>
<!--
This "assert" property works, in this context, because we run baseline first,
@@ -1404,9 +1404,9 @@
<!-- frameworkperfargs is used by library.xml ... probably an easier way? -->
<condition
property="frameworkperfargs"
- value="-Declipse.perf.dbloc=${eclipse.perf.dbloc} -Declipse.perf.config=${eclipse.perf.config} -Declipse.perf.assertAgainst=${eclipse.perf.assertAgainst}"
- else="-Declipse.perf.dbloc=${eclipse.perf.dbloc} -Declipse.perf.config=${eclipse.perf.config}">
- <isset property="eclipse.perf.assertAgainst"/>
+ value="-Declipse.perf.dbloc=${eclipse.perf.dbloc} -Declipse.perf.config=${eclipse.perf.config} -Declipse.perf.assertAgainst=${eclipse.perf.assertAgainst}"
+ else="-Declipse.perf.dbloc=${eclipse.perf.dbloc} -Declipse.perf.config=${eclipse.perf.config}">
+ <isset property="eclipse.perf.assertAgainst" />
</condition>
<ant
diff --git a/production/testScripts/test_runTests2.xml.sh b/production/testScripts/test_runTests2.xml.sh
index 34489349b..40d7c2da8 100755
--- a/production/testScripts/test_runTests2.xml.sh
+++ b/production/testScripts/test_runTests2.xml.sh
@@ -46,6 +46,7 @@ export ANT_HOME=/shared/common/apache-ant-1.8.4/
#export JAVA_HOME=/shared/common/jdk1.6.0-latest
#export JAVA_HOME=/shared/common/jdk1.7.0-latest
#export JAVA_HOME=/shared/common/jdk1.8.0_x64-latest
+
export JAVA_HOME=/shared/common/jdk1.7.0-latest
export WORKSPACE=${HOME}/tempworkarea/
export PATH=${JAVA_HOME}/bin:${ANT_HOME}/bin:/usr/local/bin:/usr/bin:/bin:${HOME}/bin
diff --git a/production/testScripts/updateTestResultsPages.sh b/production/testScripts/updateTestResultsPages.sh
index e744c7258..869eb3761 100755
--- a/production/testScripts/updateTestResultsPages.sh
+++ b/production/testScripts/updateTestResultsPages.sh
@@ -102,7 +102,6 @@ then
fi
-
JAVA_7_HOME=${JAVA_7_HOME:-/shared/common/jdk1.7.0-latest}
JAVA_8_HOME=${JAVA_8_HOME:-/shared/common/jdk1.8.0_x64-latest}
diff --git a/scripts/xsl/upVersionParents.sh b/scripts/xsl/upVersionParents.sh
index 338bde48c..a1473dfa4 100755
--- a/scripts/xsl/upVersionParents.sh
+++ b/scripts/xsl/upVersionParents.sh
@@ -7,12 +7,12 @@ LOG=$(pwd)/log_$( date +%Y%m%d%H%M%S ).txt
exec >>$LOG 2>&1
LREPO=$(pwd)/../localMavenRepo
-export JAVA_HOME=${JAVA_HOME:-/opt/local/jdk1.7.0-latest}
+export JAVA_HOME=${JAVA_HOME:-/shared/common/jdk1.7.0-latest}
TMP_DIR=${TMP_DIR:-$(pwd)/../tmp}
mkdir -p $TMP_DIR
export MAVEN_OPTS=${MAVEN_OPTS:-"-Xmx2560m -XX:MaxPermSize=256M -Djava.io.tmpdir=${TMP_DIR}"}
export MAVEN_PATH=${MAVEN_PATH:-/opt/local/apache-maven-3.1.1/bin}
-export PATH=${PATH:-$JAVA_HOME/bin:$MAVEN_PATH:$PATH}
+export PATH=${JAVA_HOME}/bin:${MAVEN_PATH}:${PATH}
DIR=$( dirname $0 )
NEW_VER=4.4.0-SNAPSHOT

Back to the top