Bug 492763 - testing fails to run on cent64 machineI20160430-2000

3 files changed, 31 insertions, 11 deletions

diff --git a/eclipse.platform.releng.tychoeclipsebuilder/eclipse-junit-tests/src/main/scripts/test.xml b/eclipse.platform.releng.tychoeclipsebuilder/eclipse-junit-tests/src/main/scripts/test.xml
index a209469ac..f38a252b7 100644
--- a/eclipse.platform.releng.tychoeclipsebuilder/eclipse-junit-tests/src/main/scripts/test.xml
+++ b/eclipse.platform.releng.tychoeclipsebuilder/eclipse-junit-tests/src/main/scripts/test.xml
@@ -275,8 +275,17 @@
       to target test environment. The intent is to make sure that apart of the tests
       works consistently, and does not "break the tests", simply because of some recent
       but in p2Director. (while unlikely, these days ... since that code is not under active
-      development ... you never know)
+      development ... you never know). We test for both "Eclipse.app" and "eclipse.app"
+      since the case of our app has changed, and the file system of MacOSX may or may 
+      not be set to "case sensitive".
     -->
+    <condition property="basePlatformInstalled">
+       <or>
+       <available file="${platformLocation}/eclipse" />
+       <available file="${platformLocation}/Eclipse.app" />
+       <available file="${platformLocation}/eclipse.app" />
+       </or>
+    </condition>
     <antcall target="${platformTarget}" />
     <antcall target="installPreferences">
       <param
@@ -289,8 +298,9 @@
   <!--setup for platform zip archives -->
   <target
     name="platform-zip"
+    unless="basePlatformInstalled"
     depends="init"
-    description="Reinstall the test Eclipse installation if specified by user">
+    description="Install the base binary platform installation">
     <condition property="platformArchiveExists">
       <available file="${platformLocation}/${platformArchive}" />
     </condition>
@@ -314,8 +324,9 @@
   <!--setup for platform tar.gz archives -->
   <target
     name="platform-tar.gz"
+    unless="basePlatformInstalled"
     depends="init"
-    description="Reinstall the test Eclipse installation if specified by user">
+    description="Install the base binary platform installation">
     <condition property="platformArchiveExists">
       <available file="${platformLocation}/${platformArchive}" />
     </condition>
@@ -750,7 +761,7 @@
 
     <condition
       property="eclipse-home"
-      value="${install}/Eclipse.app/Contents/Eclipse"
+      value="${install}/eclipse.app/Contents/Eclipse"
       else="${install}/eclipse">
       <and>
         <os family="mac" />
diff --git a/production/testScripts/configuration/sdk.tests/testScripts/test.xml b/production/testScripts/configuration/sdk.tests/testScripts/test.xml
index 78ad46cd4..246602055 100644
--- a/production/testScripts/configuration/sdk.tests/testScripts/test.xml
+++ b/production/testScripts/configuration/sdk.tests/testScripts/test.xml
@@ -275,8 +275,17 @@
       to target test environment. The intent is to make sure that apart of the tests
       works consistently, and does not "break the tests", simply because of some recent
       but in p2Director. (while unlikely, these days ... since that code is not under active
-      development ... you never know)
+      development ... you never know). We test for both "Eclipse.app" and "eclipse.app"
+      since the case of our app has changed, and the file system of MacOSX may or may 
+      not be set to "case sensitive".
     -->
+    <condition property="basePlatformInstalled">
+       <or>
+       <available file="${platformLocation}/eclipse" />
+       <available file="${platformLocation}/Eclipse.app" />
+       <available file="${platformLocation}/eclipse.app" />
+       </or>
+    </condition>
     <antcall target="${platformTarget}" />
     <antcall target="installPreferences">
       <param
@@ -289,8 +298,9 @@
   <!--setup for platform zip archives -->
   <target
     name="platform-zip"
+    unless="basePlatformInstalled"
     depends="init"
-    description="Reinstall the test Eclipse installation if specified by user">
+    description="Install the base binary platform installation">
     <condition property="platformArchiveExists">
       <available file="${platformLocation}/${platformArchive}" />
     </condition>
@@ -314,16 +324,15 @@
   <!--setup for platform tar.gz archives -->
   <target
     name="platform-tar.gz"
+    unless="basePlatformInstalled"
     depends="init"
-    description="Reinstall the test Eclipse installation if specified by user">
+    description="Install the base binary platform installation">
     <condition property="platformArchiveExists">
       <available file="${platformLocation}/${platformArchive}" />
     </condition>
     <fail
       unless="platformArchiveExists"
       message="plaform archive did not exist where expected. platformArchive: ${platformLocation}/${platformArchive}" />
-
-
     <delete
       verbose="false"
       dir="${platformLocation}/eclipse" />
@@ -750,7 +759,7 @@
 
     <condition
       property="eclipse-home"
-      value="${install}/Eclipse.app/Contents/Eclipse"
+      value="${install}/eclipse.app/Contents/Eclipse"
       else="${install}/eclipse">
       <and>
         <os family="mac" />
diff --git a/production/testScripts/runTests2.xml b/production/testScripts/runTests2.xml
index 140bf405b..645b4619d 100644
--- a/production/testScripts/runTests2.xml
+++ b/production/testScripts/runTests2.xml
@@ -646,7 +646,7 @@
 
     <condition
       property="eclipse-home"
-      value="${install}/Eclipse.app/Contents/Eclipse"
+      value="${install}/eclipse.app/Contents/Eclipse"
       else="${install}/eclipse">
       <and>
         <os family="mac" />