diff options
| author | David Williams | 2013-02-21 14:28:27 +0000 |
|---|---|---|
| committer | David Williams | 2013-02-21 14:28:27 +0000 |
| commit | a8e2c14b21689933e9e83cf5b38434f45378b216 (patch) | |
| tree | 3c7377c364413ad9b03649896d1df49d5bfd66ca /production/testScripts | |
| parent | 6ba67086b29cf8c5dcf80822f0fc55b461481146 (diff) | |
| download | eclipse.platform.releng.aggregator-a8e2c14b21689933e9e83cf5b38434f45378b216.tar.gz eclipse.platform.releng.aggregator-a8e2c14b21689933e9e83cf5b38434f45378b216.tar.xz eclipse.platform.releng.aggregator-a8e2c14b21689933e9e83cf5b38434f45378b216.zip | |
[releng] Prep for transition
Diffstat (limited to 'production/testScripts')
| -rw-r--r-- | production/testScripts/configuration/sdk.tests/testScripts/test.xml | 6 | ||||
| -rw-r--r-- | production/testScripts/genTestIndexes.xml | 4 | ||||
| -rw-r--r-- | production/testScripts/runTests2.xml | 4 | ||||
| -rwxr-xr-x | production/testScripts/startTests.sh | 4 | ||||
| -rwxr-xr-x | production/testScripts/updateTestResultsPages.sh | 13 |
5 files changed, 18 insertions, 13 deletions
diff --git a/production/testScripts/configuration/sdk.tests/testScripts/test.xml b/production/testScripts/configuration/sdk.tests/testScripts/test.xml index b9e755e5e..5c75466eb 100644 --- a/production/testScripts/configuration/sdk.tests/testScripts/test.xml +++ b/production/testScripts/configuration/sdk.tests/testScripts/test.xml @@ -1292,7 +1292,7 @@ <target name="all"> <antcall target="quickTests" /> - <antcall target="longRunningTests" /> + <!--TEMP <antcall target="longRunningTests" /> --> </target> @@ -1315,7 +1315,7 @@ name="message" value="end platform" /> </antcall> - +<!--TEMP <antcall target="markCurrentTime"> <param name="message" @@ -1345,7 +1345,7 @@ name="message" value="end quickTests" /> </antcall> - +--> </target> <target name="longRunningTests"> diff --git a/production/testScripts/genTestIndexes.xml b/production/testScripts/genTestIndexes.xml index 429547890..6c56db07f 100644 --- a/production/testScripts/genTestIndexes.xml +++ b/production/testScripts/genTestIndexes.xml @@ -33,8 +33,8 @@ <condition property="dropsDirXSegment" - value="${dropsDirSegment}cbibased" - else="${dropsDirSegment}"> + value="${dropsDirSegment}" + else="${dropsDirSegment}pdebased"> <equals arg1="${BUILD_TECH}" arg2="CBI" /> diff --git a/production/testScripts/runTests2.xml b/production/testScripts/runTests2.xml index 97e3e2695..3b2e3b98e 100644 --- a/production/testScripts/runTests2.xml +++ b/production/testScripts/runTests2.xml @@ -80,8 +80,8 @@ <condition property="dropsSuffix" - value="cbibased" - else=""> + value="" + else="pdebased"> <equals arg1="${BUILD_TECH}" arg2="CBI" /> diff --git a/production/testScripts/startTests.sh b/production/testScripts/startTests.sh index a7fe84f09..74eaa6fb4 100755 --- a/production/testScripts/startTests.sh +++ b/production/testScripts/startTests.sh @@ -50,9 +50,9 @@ function dlpath() #TODO: eventual switch so CBI is "normal" one and PDE is marked one if [[ "${BUILD_TECH}" == 'CBI' ]] then - dropsuffix=cbibased - else dropsuffix="" + else + dropsuffix="pdebased" fi pathToDL=eclipse/downloads/drops diff --git a/production/testScripts/updateTestResultsPages.sh b/production/testScripts/updateTestResultsPages.sh index 7c0a190e5..dc19601f3 100755 --- a/production/testScripts/updateTestResultsPages.sh +++ b/production/testScripts/updateTestResultsPages.sh @@ -48,16 +48,21 @@ fi pathToDL=eclipse/downloads/drops$eclipseStreamMajor fi - if [[ "$BUILD_TECH" == "CBI" ]] + if [[ "$BUILD_TECH" == "PDE" ]] then - pathToDL="${pathToDL}cbibased" + pathToDL="${pathToDL}pdebased" fi - buildRoot=/shared/eclipse/eclipse${eclipseStreamMajor}${buildType} if [[ "$BUILD_TECH" == "CBI" ]] then buildRoot=/shared/eclipse/builds/${eclipseStreamMajor}${buildType} - fi + elif [[ "$BUILD_TECH" == "PDE" ]] + then + buildRoot=/shared/eclipse/eclipse${eclipseStreamMajor}${buildType} + else + echo "ERROR: BUILD_TECH was neither PDE nor CBI." + exit 1 + fi siteDir=${buildRoot}/siteDir |