[I-Build] Unify 'testAll' scripts and remove unused default values

respectively enforce the presence of the corresponding variables.

Author: HannesWell

production/testScripts/configuration/sdk.tests/testConfigs/linux/testAll.sh

@@ -11,41 +11,24 @@ echo "command line (quoted) as passed into $(basename ${0}): ${@}"
 # such as for jvm
 source localBuildProperties.shsource 2>/dev/null
 
-if [[ -z "${propertyFile}" ]]
-then
-   echo "expect property file as environment variable for production runs"
+if [[ -z "${propertyFile}" ]]; then
+   echo "expect 'propertyFile' as environment variable for production runs"
    exit 1
 fi
-
-if [[ -z "${jvm}" ]]
-then
-   echo "expect jvm as environment variable for production runs"
+if [[ -z "${jvm}" ]]; then
+   echo "expect 'jvm' as environment variable for production runs"
    exit 1
 fi
-if [[ -z "${testedPlatform}" ]]
-then
-   echo "expect testedPlatform as environment variable for production runs"
+if [[ -z "${testedPlatform}" ]]; then
+   echo "expect 'testedPlatform' as environment variable for production runs"
    exit 1
 fi
 
 echo "PWD: $PWD"
-# in production tests, should already be set by runTests2.xml, so
-# we set to an old version here, to make obvious if not.
-export jvm=${jvm:-/shared/common/jdk-1.6.x86_64/jre/bin/java}
-
 # production machine is x86_64, but some local setups may be 32 bit and will need to provide
 # this value in localBuildProperties.shsource. (
 eclipseArch=${eclipseArch:-x86_64}
 
-# production.properties is used in production tests,
-# need to override on local setups to specify appropriate vm (usually same as jvm).
-# see bug 388269
-export propertyFile=${propertyFile:-platformSpecific.properties}
-
-# in product tests, should be set by runTests2.xml,
-# so we use "vm value",  "x.0" at end, to make obvious if that's not working.
-export testedPlatform=${testedPlatform:-linux.gtk.x86_64_x.0}
-
 echo "=== properties in testAll.sh"
 echo "    DOWNLOAD_HOST: ${DOWNLOAD_HOST}"
 echo "    jvm in testAll: ${jvm}"
@@ -54,6 +37,8 @@ echo "    propertyFile in testAll: ${propertyFile}"
 echo "    buildId in testAll: ${buildId}"
 echo "    testedPlatform: ${testedPlatform}"
 echo "    ANT_OPTS: ${ANT_OPTS}"
+echo "    contents of propertyFile:"
+cat ${propertyFile}
 
 #execute command to run tests
 /bin/chmod 755 runtests.sh

production/testScripts/configuration/sdk.tests/testConfigs/macosx/testAll.sh

@@ -10,21 +10,33 @@ ulimit -c unlimited
 
 source localBuildProperties.shsource 2>/dev/null
 
+if [[ -z "${propertyFile}" ]]; then
+  echo "expect 'propertyFile' as environment variable for production runs"
+  exit 1
+fi
+if [[ -z "${jvm}" ]]; then
+  echo "expect 'jvm' as environment variable for production runs"
+  exit 1
+fi
+if [[ -z "${testedPlatform}" ]]; then
+  echo "expect 'testedPlatform' as environment variable for production runs"
+  exit 1
+fi
+
 echo "PWD: $PWD"
-jvm=${jvm:-/Library/Java/JavaVirtualMachines/jdk1.7.0_51.jdk/Contents/Home/jre/bin/java}
 
 # production machine is x86_64, but some local setups may be 32 bit and will need to provide
 # this value in localBuildProperties.shsource.
 eclipseArch=${eclipseArch:-x86_64}
 
-# vm.properties is used by default on production machines, but will
-# need to override on local setups to specify appropriate vm (usually same as jvm).
-# see bug 388269
-propertyFile=${propertyFile:-vm.properties}
-
-echo "jvm in testAll: ${jvm}"
-echo "extdir in testAll (if any): ${extdir}"
-echo "propertyFile in testAll: ${propertyFile}"
+echo "=== properties in testAll.sh"
+echo "    DOWNLOAD_HOST: ${DOWNLOAD_HOST}"
+echo "    jvm in testAll: ${jvm}"
+echo "    extdir in testAll (if any): ${extdir}"
+echo "    propertyFile in testAll: ${propertyFile}"
+echo "    buildId in testAll: ${buildId}"
+echo "    testedPlatform: ${testedPlatform}"
+echo "    ANT_OPTS: ${ANT_OPTS}"
 echo "contents of propertyFile:"
 cat ${propertyFile}
 

production/testScripts/configuration/sdk.tests/testConfigs/windows/testAll.bat

@@ -11,20 +11,30 @@ REM so they could redefine jvm to what's appropriate to their machine and setup.
 IF EXIST localTestsProperties.bat CALL localTestsProperties.bat
 
 
-REM vm.properties is used by default on production machines, but will
-REM need to override on local setups and performance tests
-IF NOT DEFINED propertyFile SET propertyFile=vm.properties
-
-REM TODO: not sure it is good to put VM here? Is there a good default here; such as "java"?
-REM currently, in practice, we sometimes set in Hudson scripts.
-REM https://bugs.eclipse.org/bugs/show_bug.cgi?id=390286
-IF NOT DEFINED jvm SET jvm=c:\Program Files\Java\jdk1.7.0_80\jre\bin\java.exe
+IF NOT DEFINED propertyFile (
+  echo expect 'propertyFile' as environment variable for production runs
+  exit 1
+)
+IF NOT DEFINED jvm (
+  echo expect 'jvm' as environment variable for production runs
+  exit 1
+)
+IF NOT DEFINED testedPlatform (
+  echo expect 'testedPlatform' as environment variable for production runs
+  exit 1
+)
 
 IF NOT DEFINED eclipseArch SET eclipseArch=x86_64
 
-ECHO jvm in testAll.bat: %jvm%
-ECHO extdir in testAll.bat (if any): %extdir%
-ECHO propertyFile in testAll.bat: %propertyFile%
+@echo on
+ECHO === properties in testAll.bat
+ECHO     DOWNLOAD_HOST: %DOWNLOAD_HOST%
+ECHO     jvm in testAll: %jvm%
+ECHO     extdir in testAll (if any): %extdir%
+ECHO     propertyFile in testAll: %propertyFile%
+ECHO     buildId in testAll: %buildId%
+ECHO     testedPlatform: %testedPlatform%
+ECHO     ANT_OPTS: %ANT_OPTS%
 
 mkdir results\consolelogs