diff options
| author | David Williams | 2013-04-01 17:07:27 +0000 |
|---|---|---|
| committer | David Williams | 2013-04-01 17:07:27 +0000 |
| commit | 44a64151df84bfd2362d4b11ee63dff572bd119e (patch) | |
| tree | 3c4730c8fa28ea1b8fd9645e10987fb4797fdc17 /production | |
| parent | 6dad4d2ecd3fafdb2d48bec3bfefa203c18e3ddb (diff) | |
| download | eclipse.platform.releng.aggregator-44a64151df84bfd2362d4b11ee63dff572bd119e.tar.gz eclipse.platform.releng.aggregator-44a64151df84bfd2362d4b11ee63dff572bd119e.tar.xz eclipse.platform.releng.aggregator-44a64151df84bfd2362d4b11ee63dff572bd119e.zip | |
Bug 404651 - clean up helper.xml
Diffstat (limited to 'production')
8 files changed, 21 insertions, 21 deletions
diff --git a/production/testScripts/configuration/sdk.tests/testConfigs/linux/equinoxp2tests.properties b/production/testScripts/configuration/sdk.tests/testConfigs/linux/equinoxp2tests.properties index c0b536ee0..e404a2e48 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 f09007165..2c3dbb31d 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 f09007165..2c3dbb31d 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 12b995df5..1899992ed 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 ce25cea6e..5551bede6 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 1d4718a55..814f1e69a 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 6a135ea98..7bd01e0b6 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}" /> - <property file="equinoxp2tests.properties" /> + <loadproperties srcfile="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"> - <property file="equinoxp2tests.properties" /> + <loadproperties srcfile="equinoxp2tests.properties" /> <path id="launcher.paths"> <fileset dir="${eclipse-home}" diff --git a/production/testScripts/runTests2.xml b/production/testScripts/runTests2.xml index c90d48302..d1f7e0b35 100644 --- a/production/testScripts/runTests2.xml +++ b/production/testScripts/runTests2.xml @@ -555,7 +555,7 @@ file="${eclipseBuilderDir}/sdk.tests/testConfigs/${testPlatform}/equinoxp2tests.properties" token="@org.eclipse.equinox.p2.tests.current.build.repo@" value="${currentbuildrepo}" /> - <property file="${eclipseBuilderDir}/sdk.tests/testConfigs/${testPlatform}/equinoxp2tests.properties" /> + <loadproperties srcfile="${eclipseBuilderDir}/sdk.tests/testConfigs/${testPlatform}/equinoxp2tests.properties" /> <echo message="executionDir ${executionDir}" /> |