Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid Williams2014-08-12 02:18:52 -0400
committerDavid Williams2014-08-12 02:18:52 -0400
commit959357f123df45e702b5e40241bb586acd97bd1c (patch)
tree61da971242c7e4b656c3273ddb3112b61a80abb2
parent17242e73e0cf3908d451f1dca3e0aa349a6267a1 (diff)
downloadeclipse.platform.releng.aggregator-959357f123df45e702b5e40241bb586acd97bd1c.tar.gz
eclipse.platform.releng.aggregator-959357f123df45e702b5e40241bb586acd97bd1c.tar.xz
eclipse.platform.releng.aggregator-959357f123df45e702b5e40241bb586acd97bd1c.zip
[releng] synchronizing with changes required on local test machine
-rw-r--r--production/testScripts/configuration/sdk.tests/testConfigs/linux/testAll.sh1
-rw-r--r--production/testScripts/configuration/sdk.tests/testScripts/runTests.xml5
-rw-r--r--production/testScripts/configuration/sdk.tests/testScripts/test.xml6
-rw-r--r--production/testScripts/configuration/streamSpecific-build.properties3
-rw-r--r--production/testScripts/getBaseBuilder.xml16
5 files changed, 23 insertions, 8 deletions
diff --git a/production/testScripts/configuration/sdk.tests/testConfigs/linux/testAll.sh b/production/testScripts/configuration/sdk.tests/testConfigs/linux/testAll.sh
index 28a40291..64177dfb 100644
--- a/production/testScripts/configuration/sdk.tests/testConfigs/linux/testAll.sh
+++ b/production/testScripts/configuration/sdk.tests/testConfigs/linux/testAll.sh
@@ -22,6 +22,7 @@ eclipseArch=${eclipseArch:-x86_64}
# see bug 388269
propertyFile=${propertyFile:-vm.properties}
+echo "properties in testAll.sh"
echo "vmcmd in testAll: ${vmcmd}"
echo "extdir in testAll (if any): ${extdir}"
echo "propertyFile in testAll: ${propertyFile}"
diff --git a/production/testScripts/configuration/sdk.tests/testScripts/runTests.xml b/production/testScripts/configuration/sdk.tests/testScripts/runTests.xml
index 66e91f58..a145f7fd 100644
--- a/production/testScripts/configuration/sdk.tests/testScripts/runTests.xml
+++ b/production/testScripts/configuration/sdk.tests/testScripts/runTests.xml
@@ -4,7 +4,10 @@
default="runtests"
basedir=".">
-<!-- This file "copied up" from base builder ... not sure why still there. Not sure what's needed? -->
+<!-- This file is only called from "runTests2.xml" which is a "production only"
+test file so much of what is here could be combined with runTests2.xml
+and in some cases they may do things redundantly.
+ -->
<target name="runtests">
<!-- <delete dir="${testDir}" quiet="true" /> -->
diff --git a/production/testScripts/configuration/sdk.tests/testScripts/test.xml b/production/testScripts/configuration/sdk.tests/testScripts/test.xml
index ec5b0bc0..72c9c61c 100644
--- a/production/testScripts/configuration/sdk.tests/testScripts/test.xml
+++ b/production/testScripts/configuration/sdk.tests/testScripts/test.xml
@@ -318,7 +318,8 @@
main purpose of initStreamVariables, it to be sure we have eclipseStreamMajor and eclipseStreamMinor
Uses script, which requires Java 1.6 (or ... else gets complicated to setup)
-->
- <target name="initStreamVariables">
+ <target name="initStreamVariables"
+ depends="initDownloadHosts">
<!--
First location is one where file is during produciton builds.
Second location is where it is during "unit testing" of the test.xml file.
@@ -430,6 +431,7 @@
-->
<target name="initDownloadHosts" depends="checkDownloadHosts" unless="DOWNLOAD_HOST">
<!-- we assume if "DOWNLOAD_HOST" is defined, then ARCHICE_HOST has been defined also. -->
+ <property environment="env"/>
<echo message="DEBUG: Found DOWNLOAD_HOST not defined. Setting in 'initDownloadHosts'" />
<echo message="DEBUG: env.DOWNLOAD_HOST: ${env.DOWNLOAD_HOST}" />
<condition property="DOWNLOAD_HOST" value="${env.DOWNLOAD_HOST}" else="download.eclipse.org">
@@ -446,7 +448,7 @@
<echo message="DEBUG: Found DOWNLOAD_HOST already defined by 'initDownloadHosts'" />
<echo message="DEBUG: DOWNLOAD_HOST: ${DOWNLOAD_HOST}" />
</target>
- <target name="init" depends="initWorkspace,initBuildId, initBuildType, initStreamVariables, initDownloadHosts, initBasicDirectories,initOSes, initPlatformArhiveName, setRuntimeArchive" unless="testingIsInitialized">
+ <target name="init" depends="initWorkspace,initBuildId, initBuildType, initDownloadHosts, initStreamVariables, initBasicDirectories,initOSes, initPlatformArhiveName, setRuntimeArchive" unless="testingIsInitialized">
<property environment="env" />
diff --git a/production/testScripts/configuration/streamSpecific-build.properties b/production/testScripts/configuration/streamSpecific-build.properties
index 8869c98b..9cdf9485 100644
--- a/production/testScripts/configuration/streamSpecific-build.properties
+++ b/production/testScripts/configuration/streamSpecific-build.properties
@@ -27,6 +27,3 @@ previousRuntimePlatform=eclipse-platform-4.3.2-linux-gtk-x86_64.tar.gz
# BUT SHOULD BE, for the 'director' that installs tests into the platform
previousRuntimePlatformVersion=4.4
-# should not need this ... but, for me to get it to work on "test machine",
-# where downloads should come from local test machine, I currently have to change this line
-DOWNLOAD_HOST=download.eclipse.org \ No newline at end of file
diff --git a/production/testScripts/getBaseBuilder.xml b/production/testScripts/getBaseBuilder.xml
index 65396a57..c4e4e579 100644
--- a/production/testScripts/getBaseBuilder.xml
+++ b/production/testScripts/getBaseBuilder.xml
@@ -71,6 +71,7 @@
depends="hudson-init"
unless="getBaseBuilderInitialized">
+ <property environment="env" />
<!-- assign defaults if not on hudson, for local testing if nothing else -->
<property
name="WORKSPACE"
@@ -93,18 +94,29 @@
name="folderName"
value="org.eclipse.releng.basebuilder" />
- <condition property="fetchSource" value="git">
+ <!-- if not set directly by caller, see if it is an environment variable -->
+ <condition
+ property="basebuilderlocal"
+ value="${env.BASEBUILDER_LOCAL}">
+ <isset property="env.BASEBUILDER_LOCAL" />
+ </condition>
+
+ <condition
+ property="fetchSource"
+ value="git">
<not>
<isset property="basebuilderlocal" />
</not>
</condition>
+ <echo message="Properties in getBaseBuilder.xml" />
+ <echo message="basebuilderlocal: ${basebuilderlocal}" />
+ <echo message="fetchSource: ${fetchSource}" />
<echo message="hudson: ${hudson}" />
<echo message="WORKSPACE: ${WORKSPACE}" />
<echo message="basebuilder version: ${builderVersion}" />
<echo message="cvsRoot: ${cvsRoot}" />
<echo message="cvsProject: ${cvsProject}" />
- <echo message="fetchSource: ${fetchSource}" />
<!-- leave useGit undefined to imply to use CVS. Callers can override git defaults with -DfetchSource=cvs
or, anything besides 'git' implies cvs.

Back to the top