diff options
| author | Alexander Kurtakov | 2020-07-25 18:49:46 +0000 |
|---|---|---|
| committer | Alexander Kurtakov | 2020-08-03 20:24:44 +0000 |
| commit | 1590061cb8670a08a21b5b8a2fc4a22f09197931 (patch) | |
| tree | 118e7602192e598a996b8d72cbdc27ee9fcb17dd /production | |
| parent | e6cc3fb87fa70a0fef2c9aa91a796b838100353d (diff) | |
| download | eclipse.platform.releng.aggregator-1590061cb8670a08a21b5b8a2fc4a22f09197931.tar.gz eclipse.platform.releng.aggregator-1590061cb8670a08a21b5b8a2fc4a22f09197931.tar.xz eclipse.platform.releng.aggregator-1590061cb8670a08a21b5b8a2fc4a22f09197931.zip | |
Remove ancient JAVA_HOME and ANT_HOME configs.
Change-Id: I765faa052d481922c0d09ad934903bd2209f5569
Signed-off-by: Alexander Kurtakov <akurtako@redhat.com>
Diffstat (limited to 'production')
| -rwxr-xr-x | production/testScripts/configuration/sdk.tests/testScripts/testTestXMLScript.sh | 4 | ||||
| -rwxr-xr-x | production/testScripts/test_runTests2.xml.sh | 5 |
2 files changed, 0 insertions, 9 deletions
diff --git a/production/testScripts/configuration/sdk.tests/testScripts/testTestXMLScript.sh b/production/testScripts/configuration/sdk.tests/testScripts/testTestXMLScript.sh index d81e9404d..7c3cb6750 100755 --- a/production/testScripts/configuration/sdk.tests/testScripts/testTestXMLScript.sh +++ b/production/testScripts/configuration/sdk.tests/testScripts/testTestXMLScript.sh @@ -43,10 +43,6 @@ export ANT_HOME=/shared/common/apache-ant-1.9.6 # JAVA_HOME is, at least, what runs the ant instance. If no 'jvm' option is specified, # it also becomes the instance that runs the tests. -#export JAVA_HOME=/shared/common/jdk1.5.0-latest -#export JAVA_HOME=/shared/common/jdk1.6.0-latest -#export JAVA_HOME=/shared/common/jdk1.7.0-latest - JAVA_11_HOME=/opt/public/common/java/openjdk/jdk-11_x64-latest export JAVA_HOME=${JAVA_HOME:-${JAVA_11_HOME}} export PATH=${JAVA_HOME}/bin:${ANT_HOME}/bin:/usr/local/bin:/usr/bin:/bin:${HOME}/bin diff --git a/production/testScripts/test_runTests2.xml.sh b/production/testScripts/test_runTests2.xml.sh index e3e2acac8..f3a4461c2 100755 --- a/production/testScripts/test_runTests2.xml.sh +++ b/production/testScripts/test_runTests2.xml.sh @@ -35,15 +35,10 @@ source localBuildProperties.shsource 2>/dev/null # Different versions of Ant are specified here in test script, just to confirm # nothing is specific to any recent version of ant. (Though, some of the machines # have ant 1.6 set as 'default'!) -#export ANT_HOME=/shared/common/apache-ant-1.7.1 -#export ANT_HOME=/shared/common/apache-ant-1.8.4/ export ANT_HOME=/shared/common/apache-ant-1.9.6 # JAVA_HOME is, at least, what runs the ant instance. If no 'jvm' option is specified, # it also becomes the instance that runs the tests. -#export JAVA_HOME=/shared/common/jdk1.5.0-latest -#export JAVA_HOME=/shared/common/jdk1.6.0-latest -#export JAVA_HOME=/shared/common/jdk1.7.0-latest JAVA_11_HOME=/opt/public/common/java/openjdk/jdk-11_x64-latest export JAVA_HOME=${JAVA_HOME:-${JAVA_11_HOME}} |