Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid Williams2015-03-21 19:52:43 +0000
committerDavid Williams2015-03-21 19:52:43 +0000
commit1784712f0c3c84d90749fab064e3d0b71db395bf (patch)
tree119d6ca9b306fc2f2ea858019326e9a6638f12d1 /production/testScripts/runTests2.xml
parented466be4c02caa610f69060bffe919a53350db3e (diff)
downloadeclipse.platform.releng.aggregator-1784712f0c3c84d90749fab064e3d0b71db395bf.tar.gz
eclipse.platform.releng.aggregator-1784712f0c3c84d90749fab064e3d0b71db395bf.tar.xz
eclipse.platform.releng.aggregator-1784712f0c3c84d90749fab064e3d0b71db395bf.zip
Bug 461678 - Modify JUnit test framework to work with "Mac App" form
refactoring
Diffstat (limited to 'production/testScripts/runTests2.xml')
-rw-r--r--production/testScripts/runTests2.xml30
1 files changed, 18 insertions, 12 deletions
diff --git a/production/testScripts/runTests2.xml b/production/testScripts/runTests2.xml
index badbbe1a..9e696e1a 100644
--- a/production/testScripts/runTests2.xml
+++ b/production/testScripts/runTests2.xml
@@ -124,7 +124,7 @@
files.
-->
<!-- currently, following is dead code. Leaving for now as a reminder to allow localCache again, someday -->
- <condition
+ <condition
property="archiveLocation"
value="${localCache}"
else="${buildURL}">
@@ -394,8 +394,8 @@
arg2="x86" />
</and>
</condition>
- <echo message="os ws arch ${osgi.os} ${osgi.ws} ${osgi.arch}" />
- <echo message="testPlatform ${testPlatform}" />
+ <echo message="[DEBUG] in runTest2.xml: os ws arch ${osgi.os} ${osgi.ws} ${osgi.arch}" />
+ <echo message="[INFO] in runTest2.xml: testPlatform ${testPlatform}" />
</target>
<!--
@@ -488,7 +488,8 @@
<copy
todir="${executionDir}"
verbose="true">
- <fileset dir="${configurationDir}/sdk.tests/testConfigs/${testPlatform}" />
+ <fileset
+ dir="${configurationDir}/sdk.tests/testConfigs/${testPlatform}" />
</copy>
<copy
verbose="true"
@@ -587,6 +588,7 @@
<printProperty property="executionDir" />
<printProperty property="install" />
<printProperty property="eclipse-home" />
+ <printProperty property="isMacAppLayout" />
<printProperty property="configurationDir" />
<printProperty property="testSuite" />
<printProperty property="skipDerby" />
@@ -678,10 +680,13 @@
<!-- echo a few typically expected properties, to make sure getting right file -->
- <echo message="streamSpecificPropertiesTitle: ${streamSpecificPropertiesTitle}" />
+ <echo
+ message="streamSpecificPropertiesTitle: ${streamSpecificPropertiesTitle}" />
- <echo message="apiTestsPreviousBaseDLBaseURL: ${apiTestsPreviousBaseDLBaseURL}" />
- <echo message="apiTestsPreviousBaseWin32Filename: ${apiTestsPreviousBaseWin32Filename}" />
+ <echo
+ message="apiTestsPreviousBaseDLBaseURL: ${apiTestsPreviousBaseDLBaseURL}" />
+ <echo
+ message="apiTestsPreviousBaseWin32Filename: ${apiTestsPreviousBaseWin32Filename}" />
<echo message="previousReleaseLocation: ${previousReleaseLocation}" />
<echo message="previousReleaseVersion: ${previousReleaseVersion}" />
@@ -701,7 +706,8 @@
unless="DOWNLOAD_HOST">
<!-- we assume if "DOWNLOAD_HOST" is defined, then ARCHIVE_HOST has been defined also. -->
<property environment="env" />
- <echo message="DEBUG: Found DOWNLOAD_HOST not defined. Setting in 'initDownloadHosts'" />
+ <echo
+ message="DEBUG: Found DOWNLOAD_HOST not defined. Setting in 'initDownloadHosts'" />
<echo message="DEBUG: env.DOWNLOAD_HOST: ${env.DOWNLOAD_HOST}" />
<condition
property="DOWNLOAD_HOST"
@@ -890,14 +896,14 @@
For the context of this script eclipse-home is actually
set to be the folder containing the plugins folder
-->
- <!-- TODO should have another variable, or computation, know if we should check this,
- or also handle traditional layout, and use "eclipse' folder.
- -->
<condition
property="eclipse-home"
value="${install}/Eclipse.app/Contents/Eclipse"
else="${install}/eclipse">
- <os family="mac" />
+ <and>
+ <os family="mac" />
+ <istrue value="${isMacAppLayout}" />
+ </and>
</condition>
<mkdir dir="${eclipse-home}" />
<echo message="eclipse-home: ${eclipse-home}" />

Back to the top