From 860590828fef3de9562577e5c38fe37e71736b25 Mon Sep 17 00:00:00 2001
From: David Williams
Date: Tue, 19 Aug 2014 02:12:23 -0400
Subject: Bug 441889 - refactor "production test scripts"

---
 .../testConfigs/macosx/equinoxp2tests.properties   | 33 ---------------
 .../testConfigs/macosx/org.eclipse.core.net.prefs  | 11 -----
 .../testConfigs/macosx/platformSpecific.properties | 48 ++++++++++++++++++++++
 .../testConfigs/macosx/testing.properties          | 41 ------------------
 .../sdk.tests/testConfigs/macosx/vm.properties     | 30 --------------
 5 files changed, 48 insertions(+), 115 deletions(-)
 delete mode 100644 production/testScripts/configuration/sdk.tests/testConfigs/macosx/equinoxp2tests.properties
 delete mode 100644 production/testScripts/configuration/sdk.tests/testConfigs/macosx/org.eclipse.core.net.prefs
 create mode 100644 production/testScripts/configuration/sdk.tests/testConfigs/macosx/platformSpecific.properties
 delete mode 100644 production/testScripts/configuration/sdk.tests/testConfigs/macosx/testing.properties
 delete mode 100644 production/testScripts/configuration/sdk.tests/testConfigs/macosx/vm.properties

(limited to 'production/testScripts/configuration/sdk.tests/testConfigs/macosx')

diff --git a/production/testScripts/configuration/sdk.tests/testConfigs/macosx/equinoxp2tests.properties b/production/testScripts/configuration/sdk.tests/testConfigs/macosx/equinoxp2tests.properties
deleted file mode 100644
index ac1e56b61..000000000
--- a/production/testScripts/configuration/sdk.tests/testConfigs/macosx/equinoxp2tests.properties
+++ /dev/null
@@ -1,33 +0,0 @@
-# Properties required by equinox p2 tests, and others?
-# Version from production/testScripts/configuration/sdk.tests/testConfigs
-# The test framework re-writes this file with the correct short versions, 
-# with all variables resolved, so others (e.g. p2 tests) can read it as a normal
-# property file.
-
-org.eclipse.equinox.p2.reconciler.tests.platform.archive.linux=${executionDir}/eclipse-platform-${buildId}-linux-gtk.tar.gz
-org.eclipse.equinox.p2.reconciler.tests.platform.archive.linux-x86_64=${executionDir}/eclipse-platform-${buildId}-linux-gtk-x86_64.tar.gz
-org.eclipse.equinox.p2.reconciler.tests.platform.archive.win32=${executionDir}/eclipse-platform-${buildId}-win32.zip
-org.eclipse.equinox.p2.reconciler.tests.platform.archive.win32-x86_64=${executionDir}/eclipse-platform-${buildId}-win32-x86_64.zip
-org.eclipse.equinox.p2.reconciler.tests.platform.archive.macosx=${executionDir}/eclipse-platform-${buildId}-macosx-cocoa.tar.gz
-org.eclipse.equinox.p2.reconciler.tests.platform.archive.macosx-x86_64=${executionDir}/eclipse-platform-${buildId}-macosx-cocoa-x86_64.tar.gz
-
-org.eclipse.equinox.p2.reconciler.tests.lastrelease.platform.archive.linux=${executionDir}/eclipse-platform-4.4-linux-gtk.tar.gz
-org.eclipse.equinox.p2.reconciler.tests.lastrelease.platform.archive.linux-x86_64=${executionDir}/eclipse-platform-4.4-linux-gtk-x86_64.tar.gz
-org.eclipse.equinox.p2.reconciler.tests.lastrelease.platform.archive.win32=${executionDir}/eclipse-platform-4.4-win32.zip
-org.eclipse.equinox.p2.reconciler.tests.lastrelease.platform.archive.win32-x86_64=${executionDir}/eclipse-platform-4.4-win32-x86_64.zip
-org.eclipse.equinox.p2.reconciler.tests.lastrelease.platform.archive.macosx=${executionDir}/eclipse-platform-4.4-macosx-cocoa.tar.gz
-org.eclipse.equinox.p2.reconciler.tests.lastrelease.platform.archive.macosx-x86_64=${executionDir}/eclipse-platform-4.4-macosx-cocoa-x86_64.tar.gz
-
-org.eclipse.equinox.p2.tests.current.build.repo=http://${DOWNLOAD_HOST}/eclipse/updates/${eclipseStreamMajor}.${eclipseStreamMinor}-${buildType}-builds/${buildId}
-org.eclipse.equinox.p2.tests.last.release.build.repo=http://${DOWNLOAD_HOST}/eclipse/updates/4.4/R-4.4-201406061215
-
-# THe p2 framework requires this file "fully formed", as it reads
-# as normal properties, instead of using the properties as defined
-# by test framework.  From what I can see, it especially requires
-#  org.eclipse.equinox.p2.tests.current.build.repo
-#  org.eclipse.equinox.p2.tests.last.release.build.repo
-#  org.eclipse.equinox.p2.reconciler.tests.platform.archive
-# Those elsewhere (API tests?) may depend on 
-#  org.eclipse.equinox.p2.reconciler.tests.lastrelease.platform.archive
-# but believe it uses the property as provided (does not re-read file).
-# Hence, that's why test framework did a "replace"
\ No newline at end of file
diff --git a/production/testScripts/configuration/sdk.tests/testConfigs/macosx/org.eclipse.core.net.prefs b/production/testScripts/configuration/sdk.tests/testConfigs/macosx/org.eclipse.core.net.prefs
deleted file mode 100644
index a073528e3..000000000
--- a/production/testScripts/configuration/sdk.tests/testConfigs/macosx/org.eclipse.core.net.prefs
+++ /dev/null
@@ -1,11 +0,0 @@
-eclipse.preferences.version=1
-org.eclipse.core.net.hasMigrated=true
-proxiesEnabled=true
-systemProxiesEnabled=true
-nonProxiedHosts=172.30.206.*
-proxyData/HTTP/hasAuth=false
-proxyData/HTTP/host=proxy.eclipse.org
-proxyData/HTTP/port=9898
-proxyData/HTTPS/hasAuth=false
-proxyData/HTTPS/host=proxy.eclipse.org
-proxyData/HTTPS/port=9898
diff --git a/production/testScripts/configuration/sdk.tests/testConfigs/macosx/platformSpecific.properties b/production/testScripts/configuration/sdk.tests/testConfigs/macosx/platformSpecific.properties
new file mode 100644
index 000000000..605b67650
--- /dev/null
+++ b/production/testScripts/configuration/sdk.tests/testConfigs/macosx/platformSpecific.properties
@@ -0,0 +1,48 @@
+
+# This properties file contains items that are specific to the platform being tested, 
+# Typically includes items dependent on exact OS, architecture, and location of files.
+# (Historically, this info used to be contained in several files, such as 'vm.properties', 
+# testing.properties, etc.)
+
+# This value, testedPlatform, is computed by scripts, but there may be need or opportunity
+# to denote "extra data" if set here? (But, other changes will be 
+# needed to be fully functional, since indexer, web pages also depend 
+# on this value.
+# testedPlatform=macosx.cocoa.x86_64_7.0
+
+# This is the VM to use to run the tests, if one prefers
+# to use a different one from the one that stared the whole process.
+jvm=/Library/Java/JavaVirtualMachines/jdk1.7.0_51.jdk/Contents/Home/jre/bin/java
+
+# TODO: can also list VMs to use for specific execution environments
+
+# https://bugs.eclipse.org/bugs/show_bug.cgi?id=392213
+# If this property is set, the actual location and file name
+# is computed at test time, but this is assumed to be the
+# VM argument required to specify that location.
+loglocationarg=-XX:ErrorFile
+
+# executable for ant <exec task
+testExecutable=bash
+
+#name of script to execute
+testScript=./testAll.sh
+
+# This value gets written to the "preference file", named org.eclipse.core.net.prefs. 
+# We implement as a property string, since eventually we may test multiple proxy settings.
+# These listed here are for tests running on build.eclipse.org, to access files outside 
+# eclipse.org infrastructure.
+org.eclipse.core.net.prefs="\
+eclipse.preferences.version=1\n\
+org.eclipse.core.net.hasMigrated=true\n\
+proxiesEnabled=true\n\
+systemProxiesEnabled=true\n\
+nonProxiedHosts=172.30.206.*\n\
+proxyData/HTTP/hasAuth=false\n\
+proxyData/HTTP/host=proxy.eclipse.org\n\
+proxyData/HTTP/port=9898\n\
+proxyData/HTTPS/hasAuth=false\n\
+proxyData/HTTPS/host=proxy.eclipse.org\n\
+proxyData/HTTPS/port=9898\n"
+
+cvstest.properties=/Users/hudsonbuild/cvstest.properties
diff --git a/production/testScripts/configuration/sdk.tests/testConfigs/macosx/testing.properties b/production/testScripts/configuration/sdk.tests/testConfigs/macosx/testing.properties
deleted file mode 100644
index a0c3a068e..000000000
--- a/production/testScripts/configuration/sdk.tests/testConfigs/macosx/testing.properties
+++ /dev/null
@@ -1,41 +0,0 @@
-###############################################################################
-# Copyright (c) 2004, 2014 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-#     IBM Corporation - initial API and implementation
-###############################################################################
-
-platform=macosx.cocoa.x86_64_7.0
-
-#directory on test machine where automated testing framework will be installed
-#testDir=${testDir}
-
-#name of zip file containing automated testing framework and JUnit test plug-ins
-testFramework=${testDir}/eclipse-Automated-Tests-${buildId}.zip
-
-#name of runtime to install and test
-runtime=eclipse-SDK-${buildId}-macosx-cocoa.tar-x86_64.gz
-
-#name of deltaPack to install and test
-runtimeDeltapack=eclipse-${buildId}-delta-pack.zip
-
-#name of Platform runtime to install and test
-platformArchive=eclipse-platform-${buildId}-macosx-cocoa.tar-x86_64.gz
-
-# Not currently used on eclipse.org tests?
-previousRuntimePlatform=eclipse-platform-4.3.2-macosx-cocoa.tar-x86_64.gz
-
-#directory where test scripts are launched
-executionDir=${testDir}/eclipse-testing
-
-testExecutable=bash
-
-#name of script to execute on remote machine
-testScript=./testAll.sh
-
-#arguments to $(testScript)
-args=
diff --git a/production/testScripts/configuration/sdk.tests/testConfigs/macosx/vm.properties b/production/testScripts/configuration/sdk.tests/testConfigs/macosx/vm.properties
deleted file mode 100644
index c74a75692..000000000
--- a/production/testScripts/configuration/sdk.tests/testConfigs/macosx/vm.properties
+++ /dev/null
@@ -1,30 +0,0 @@
-###############################################################################
-# Copyright (c) 2000, 2014 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-#     IBM Corporation - initial API and implementation
-###############################################################################
-testedPlatform=macosx.cocoa.x86_64_7.0
-
-jvm=/Library/Java/JavaVirtualMachines/jdk1.7.0_51.jdk/Contents/Home/jre/bin/java
-# https://bugs.eclipse.org/bugs/show_bug.cgi?id=392213
-# If this property is set, the actual location and file name
-# is computed at test time, but this is assumed to be the
-# VM argument required to specify that location.
-loglocationarg=-XX:ErrorFile
-
-# currently this variable is "hard coded" to work on Hudson.
-# not required if no proxies to use or bypass
-# TODO: make more sensitive to env. setttings in future so can
-# support tests on non Ecipse Infrastructure
-# If this property is defined, and file exists, the Eclipse infrastructure
-# will copy these "preferences" to
-# ${executionDir}/test-eclipse/eclipse/configuration/.settings/
-# after the test instance of eclipse is installed.
-# It is assumed the file itself gets copied to "execution directory" by
-# runTests2.xml approx. line 488
-org.eclipse.core.net.prefs=org.eclipse.core.net.prefs
-- 
cgit v1.2.3