Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid Williams2014-08-03 19:50:11 -0400
committerDavid Williams2014-08-03 19:50:11 -0400
commit3a69cede8005d61de4f45d5ac896eee0ad06f043 (patch)
treeaeee8dceaf6025a31e0b9d60444c1a3e9ed5818f /production/testScripts/configuration/sdk.tests/testConfigs/macosx
parentdd7d6e40f52344ac89d832fc2dadad1d09d3c514 (diff)
downloadeclipse.platform.releng.aggregator-3a69cede8005d61de4f45d5ac896eee0ad06f043.tar.gz
eclipse.platform.releng.aggregator-3a69cede8005d61de4f45d5ac896eee0ad06f043.tar.xz
eclipse.platform.releng.aggregator-3a69cede8005d61de4f45d5ac896eee0ad06f043.zip
Bug 440604 - update equinoxp2tests.properties file
Diffstat (limited to 'production/testScripts/configuration/sdk.tests/testConfigs/macosx')
-rw-r--r--production/testScripts/configuration/sdk.tests/testConfigs/macosx/equinoxp2tests.properties46
-rw-r--r--production/testScripts/configuration/sdk.tests/testConfigs/macosx/testing.properties6
-rw-r--r--production/testScripts/configuration/sdk.tests/testConfigs/macosx/vm.properties2
3 files changed, 34 insertions, 20 deletions
diff --git a/production/testScripts/configuration/sdk.tests/testConfigs/macosx/equinoxp2tests.properties b/production/testScripts/configuration/sdk.tests/testConfigs/macosx/equinoxp2tests.properties
index d7ce0090..ac1e56b6 100644
--- a/production/testScripts/configuration/sdk.tests/testConfigs/macosx/equinoxp2tests.properties
+++ b/production/testScripts/configuration/sdk.tests/testConfigs/macosx/equinoxp2tests.properties
@@ -1,19 +1,33 @@
-#Properties required by equinox p2 tests
-#Version from production/testScripts/configuration/sdk.tests/testConfigs
+# 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=\${basedir}/eclipse-platform-${buildId}-linux-gtk.tar.gz
-org.eclipse.equinox.p2.reconciler.tests.platform.archive.linux-x86_64=\${basedir}/eclipse-platform-${buildId}-linux-gtk-x86_64.tar.gz
-org.eclipse.equinox.p2.reconciler.tests.platform.archive.win32=\${basedir}\\eclipse-platform-${buildId}-win32.zip
-org.eclipse.equinox.p2.reconciler.tests.platform.archive.win32-x86_64=\${basedir}\\\\eclipse-platform-${buildId}-win32-x86_64.zip
-org.eclipse.equinox.p2.reconciler.tests.platform.archive.macosx=\${basedir}/eclipse-platform-${buildId}-macosx-cocoa.tar.gz
-org.eclipse.equinox.p2.reconciler.tests.platform.archive.macosx-x86_64=\${basedir}/eclipse-platform-${buildId}-macosx-cocoa-x86_64.tar.gz
+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=\${basedir}/eclipse-platform-4.4-linux-gtk.tar.gz
-org.eclipse.equinox.p2.reconciler.tests.lastrelease.platform.archive.linux-x86_64=\${basedir}/eclipse-platform-4.4-linux-gtk-x86_64.tar.gz
-org.eclipse.equinox.p2.reconciler.tests.lastrelease.platform.archive.win32=\${basedir}\\\\eclipse-platform-4.4-win32.zip
-org.eclipse.equinox.p2.reconciler.tests.lastrelease.platform.archive.win32-x86_64=\${basedir}\\\\eclipse-platform-4.4-win32-x86_64.zip
-org.eclipse.equinox.p2.reconciler.tests.lastrelease.platform.archive.macosx=\${basedir}/eclipse-platform-4.4-macosx-cocoa.tar.gz
-org.eclipse.equinox.p2.reconciler.tests.lastrelease.platform.archive.macosx-x86_64=\${basedir}/eclipse-platform-4.4-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 \ No newline at end of file
+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/testing.properties b/production/testScripts/configuration/sdk.tests/testConfigs/macosx/testing.properties
index 0db804ed..a0c3a068 100644
--- a/production/testScripts/configuration/sdk.tests/testConfigs/macosx/testing.properties
+++ b/production/testScripts/configuration/sdk.tests/testConfigs/macosx/testing.properties
@@ -18,16 +18,16 @@ platform=macosx.cocoa.x86_64_7.0
testFramework=${testDir}/eclipse-Automated-Tests-${buildId}.zip
#name of runtime to install and test
-runtime=eclipse-SDK-${buildId}-macosx-cocoa.tar.gz
+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
-runtimePlatform=eclipse-platform-${buildId}-macosx-cocoa.tar.gz
+platformArchive=eclipse-platform-${buildId}-macosx-cocoa.tar-x86_64.gz
# Not currently used on eclipse.org tests?
-previousRuntimePlatform=eclipse-platform-3.7.1-macosx-cocoa.tar.gz
+previousRuntimePlatform=eclipse-platform-4.3.2-macosx-cocoa.tar-x86_64.gz
#directory where test scripts are launched
executionDir=${testDir}/eclipse-testing
diff --git a/production/testScripts/configuration/sdk.tests/testConfigs/macosx/vm.properties b/production/testScripts/configuration/sdk.tests/testConfigs/macosx/vm.properties
index af31d6d6..c74a7569 100644
--- a/production/testScripts/configuration/sdk.tests/testConfigs/macosx/vm.properties
+++ b/production/testScripts/configuration/sdk.tests/testConfigs/macosx/vm.properties
@@ -8,7 +8,7 @@
# Contributors:
# IBM Corporation - initial API and implementation
###############################################################################
-platform=macosx.cocoa.x86_64_7.0
+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

Back to the top