diff options
| author | David Williams | 2013-04-01 18:38:42 +0000 |
|---|---|---|
| committer | David Williams | 2013-04-01 18:38:42 +0000 |
| commit | a0f0400c95a0c8d4b9fd22256769436bcfd79aa1 (patch) | |
| tree | cee38b9a172654f90f425225c78d8a67bd08aa02 /production/testScripts/configuration/sdk.tests | |
| parent | 44a64151df84bfd2362d4b11ee63dff572bd119e (diff) | |
| download | eclipse.platform.releng.aggregator-a0f0400c95a0c8d4b9fd22256769436bcfd79aa1.tar.gz eclipse.platform.releng.aggregator-a0f0400c95a0c8d4b9fd22256769436bcfd79aa1.tar.xz eclipse.platform.releng.aggregator-a0f0400c95a0c8d4b9fd22256769436bcfd79aa1.zip | |
Revert "Bug 404651 - clean up helper.xml"
testManifest.xml needs @build@ symbol, not ${buildId}, for now
This reverts commit 44a64151df84bfd2362d4b11ee63dff572bd119e.
Diffstat (limited to 'production/testScripts/configuration/sdk.tests')
7 files changed, 20 insertions, 20 deletions
diff --git a/production/testScripts/configuration/sdk.tests/testConfigs/linux/equinoxp2tests.properties b/production/testScripts/configuration/sdk.tests/testConfigs/linux/equinoxp2tests.properties index e404a2e48..c0b536ee0 100644 --- a/production/testScripts/configuration/sdk.tests/testConfigs/linux/equinoxp2tests.properties +++ b/production/testScripts/configuration/sdk.tests/testConfigs/linux/equinoxp2tests.properties @@ -3,7 +3,7 @@ org.eclipse.equinox.p2.reconciler.tests.lastrelease.platform.archive.linux-x86_6 org.eclipse.equinox.p2.tests.current.build.repo=@org.eclipse.equinox.p2.tests.current.build.repo@ org.eclipse.equinox.p2.reconciler.tests.lastrelease.platform.archive.win32=@executionDir@\\eclipse-platform-3.7.2-win32.zip org.eclipse.equinox.p2.reconciler.tests.lastrelease.platform.archive.macosx=@executionDir@/eclipse-platform-3.7.2-macosx-cocoa.tar.gz -org.eclipse.equinox.p2.reconciler.tests.platform.archive.linux=@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.macosx=@executionDir@/eclipse-platform-${buildId}-macosx-cocoa.tar.gz +org.eclipse.equinox.p2.reconciler.tests.platform.archive.linux=@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.macosx=@executionDir@/eclipse-platform-@buildId@-macosx-cocoa.tar.gz org.eclipse.equinox.p2.tests.last.release.build.repo=http\://download.eclipse.org/eclipse/updates/4.1/R-4.1.2-201202230900
\ No newline at end of file diff --git a/production/testScripts/configuration/sdk.tests/testConfigs/linux32/equinoxp2tests.properties b/production/testScripts/configuration/sdk.tests/testConfigs/linux32/equinoxp2tests.properties index 2c3dbb31d..f09007165 100644 --- a/production/testScripts/configuration/sdk.tests/testConfigs/linux32/equinoxp2tests.properties +++ b/production/testScripts/configuration/sdk.tests/testConfigs/linux32/equinoxp2tests.properties @@ -3,7 +3,7 @@ org.eclipse.equinox.p2.reconciler.tests.lastrelease.platform.archive.linux=@exec org.eclipse.equinox.p2.tests.current.build.repo=@org.eclipse.equinox.p2.tests.current.build.repo@ org.eclipse.equinox.p2.reconciler.tests.lastrelease.platform.archive.win32=@executionDir@\\eclipse-platform-3.7.2-win32.zip org.eclipse.equinox.p2.reconciler.tests.lastrelease.platform.archive.macosx=@executionDir@/eclipse-platform-3.7.2-macosx-cocoa.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.win32=@executionDir@\\eclipse-platform-${buildId}-win32.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.linux=@executionDir@/eclipse-platform-@buildId@-linux-gtk.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.macosx=@executionDir@/eclipse-platform-@buildId@-macosx-cocoa.tar.gz org.eclipse.equinox.p2.tests.last.release.build.repo=http\://download.eclipse.org/eclipse/updates/4.1/R-4.1.2-201202230900
\ No newline at end of file diff --git a/production/testScripts/configuration/sdk.tests/testConfigs/macmini/equinoxp2tests.properties b/production/testScripts/configuration/sdk.tests/testConfigs/macmini/equinoxp2tests.properties index 2c3dbb31d..f09007165 100644 --- a/production/testScripts/configuration/sdk.tests/testConfigs/macmini/equinoxp2tests.properties +++ b/production/testScripts/configuration/sdk.tests/testConfigs/macmini/equinoxp2tests.properties @@ -3,7 +3,7 @@ org.eclipse.equinox.p2.reconciler.tests.lastrelease.platform.archive.linux=@exec org.eclipse.equinox.p2.tests.current.build.repo=@org.eclipse.equinox.p2.tests.current.build.repo@ org.eclipse.equinox.p2.reconciler.tests.lastrelease.platform.archive.win32=@executionDir@\\eclipse-platform-3.7.2-win32.zip org.eclipse.equinox.p2.reconciler.tests.lastrelease.platform.archive.macosx=@executionDir@/eclipse-platform-3.7.2-macosx-cocoa.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.win32=@executionDir@\\eclipse-platform-${buildId}-win32.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.linux=@executionDir@/eclipse-platform-@buildId@-linux-gtk.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.macosx=@executionDir@/eclipse-platform-@buildId@-macosx-cocoa.tar.gz org.eclipse.equinox.p2.tests.last.release.build.repo=http\://download.eclipse.org/eclipse/updates/4.1/R-4.1.2-201202230900
\ No newline at end of file diff --git a/production/testScripts/configuration/sdk.tests/testConfigs/macosx/equinoxp2tests.properties b/production/testScripts/configuration/sdk.tests/testConfigs/macosx/equinoxp2tests.properties index 1899992ed..12b995df5 100644 --- a/production/testScripts/configuration/sdk.tests/testConfigs/macosx/equinoxp2tests.properties +++ b/production/testScripts/configuration/sdk.tests/testConfigs/macosx/equinoxp2tests.properties @@ -3,7 +3,7 @@ org.eclipse.equinox.p2.reconciler.tests.lastrelease.platform.archive.linux=@exec org.eclipse.equinox.p2.tests.current.build.repo=@org.eclipse.equinox.p2.tests.current.build.repo@ org.eclipse.equinox.p2.reconciler.tests.lastrelease.platform.archive.win32=@executionDir@\\eclipse-platform-3.7.2-win32.zip org.eclipse.equinox.p2.reconciler.tests.lastrelease.platform.archive.macosx-x86_64=@executionDir@/eclipse-platform-3.7.2-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.win32=@executionDir@\\eclipse-platform-${buildId}-win32.zip -org.eclipse.equinox.p2.reconciler.tests.platform.archive.macosx=@executionDir@/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.win32=@executionDir@\\eclipse-platform-@buildId@-win32.zip +org.eclipse.equinox.p2.reconciler.tests.platform.archive.macosx=@executionDir@/eclipse-platform-@buildId@-macosx-cocoa-x86_64.tar.gz org.eclipse.equinox.p2.tests.last.release.build.repo=http\://download.eclipse.org/eclipse/updates/4.1/R-4.1.2-201202230900
\ No newline at end of file diff --git a/production/testScripts/configuration/sdk.tests/testConfigs/win7-64/equinoxp2tests.properties b/production/testScripts/configuration/sdk.tests/testConfigs/win7-64/equinoxp2tests.properties index 5551bede6..ce25cea6e 100644 --- a/production/testScripts/configuration/sdk.tests/testConfigs/win7-64/equinoxp2tests.properties +++ b/production/testScripts/configuration/sdk.tests/testConfigs/win7-64/equinoxp2tests.properties @@ -3,7 +3,7 @@ org.eclipse.equinox.p2.reconciler.tests.lastrelease.platform.archive.linux=@exec org.eclipse.equinox.p2.tests.current.build.repo=@org.eclipse.equinox.p2.tests.current.build.repo@ org.eclipse.equinox.p2.reconciler.tests.lastrelease.platform.archive.win32-x86_64=@executionDir@\\eclipse-platform-3.7.2-win32-x86_64.zip org.eclipse.equinox.p2.reconciler.tests.lastrelease.platform.archive.macosx=@executionDir@\\eclipse-platform-3.7.2-macosx-cocoa.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.win32=@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.linux=@executionDir@\\eclipse-platform-@buildId@-linux-gtk.tar.gz +org.eclipse.equinox.p2.reconciler.tests.platform.archive.win32=@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.tests.last.release.build.repo=http\://download.eclipse.org/eclipse/updates/4.1/R-4.1.2-201202230900 diff --git a/production/testScripts/configuration/sdk.tests/testConfigs/win7/equinoxp2tests.properties b/production/testScripts/configuration/sdk.tests/testConfigs/win7/equinoxp2tests.properties index 814f1e69a..1d4718a55 100644 --- a/production/testScripts/configuration/sdk.tests/testConfigs/win7/equinoxp2tests.properties +++ b/production/testScripts/configuration/sdk.tests/testConfigs/win7/equinoxp2tests.properties @@ -3,7 +3,7 @@ org.eclipse.equinox.p2.reconciler.tests.lastrelease.platform.archive.linux=@exec org.eclipse.equinox.p2.tests.current.build.repo=@org.eclipse.equinox.p2.tests.current.build.repo@ org.eclipse.equinox.p2.reconciler.tests.lastrelease.platform.archive.win32=@executionDir@\\eclipse-platform-3.7.2-win32.zip org.eclipse.equinox.p2.reconciler.tests.lastrelease.platform.archive.macosx=@executionDir@\\eclipse-platform-3.7.2-macosx-cocoa.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.win32=@executionDir@\\eclipse-platform-${buildId}-win32.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.linux=@executionDir@\\eclipse-platform-@buildId@-linux-gtk.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.macosx=@executionDir@\\eclipse-platform-@buildId@-macosx-cocoa.tar.gz org.eclipse.equinox.p2.tests.last.release.build.repo=http\://download.eclipse.org/eclipse/updates/4.1/R-4.1.2-201202230900 diff --git a/production/testScripts/configuration/sdk.tests/testScripts/test.xml b/production/testScripts/configuration/sdk.tests/testScripts/test.xml index 7bd01e0b6..6a135ea98 100644 --- a/production/testScripts/configuration/sdk.tests/testScripts/test.xml +++ b/production/testScripts/configuration/sdk.tests/testScripts/test.xml @@ -177,7 +177,7 @@ <!--use an stable version of the director so that instability in the current build doesn't cause all the tests to fail --> <target name="setupPlatform"> <echo message="os.arch ${os.arch}" /> - <loadproperties srcfile="equinoxp2tests.properties" /> + <property file="equinoxp2tests.properties" /> <condition property="platformArchive" value="${org.eclipse.equinox.p2.reconciler.tests.lastrelease.platform.archive.linux}"> @@ -303,7 +303,7 @@ <target name="installExtraPlugins" if="extraIU"> - <loadproperties srcfile="equinoxp2tests.properties" /> + <property file="equinoxp2tests.properties" /> <path id="launcher.paths"> <fileset dir="${eclipse-home}" |