Bug 390986 - change platform names to contain accurate "bits" and VM

Levels

To Fix failing Windows Tests (plus)

7 files changed, 72 insertions, 72 deletions

diff --git a/production/testScripts/configuration/sdk.tests/testConfigs/linux/vm.properties b/production/testScripts/configuration/sdk.tests/testConfigs/linux/vm.properties
index 331d6fb83..edfca2e11 100644
--- a/production/testScripts/configuration/sdk.tests/testConfigs/linux/vm.properties
+++ b/production/testScripts/configuration/sdk.tests/testConfigs/linux/vm.properties
@@ -8,9 +8,8 @@
 # Contributors:
 #     IBM Corporation - initial API and implementation
 ###############################################################################
-platform=linux.gtk.x86_6.0
-#jvm=/shared/common/jdk-1.6.x86_64/jre/bin/java
-#jvm=/shared/common/jdk-1.6.x86_64/jre/bin/java
+
+#jvm=/shared/common/jdk1.6.0-latest/jre/bin/java
 #jvm=/shared/common/jdk1.7.0-latest/jre/bin/java
 jvm=/shared/common/jdk1.8.0_x64-latest/jre/bin/java
 
diff --git a/production/testScripts/configuration/sdk.tests/testConfigs/linux32/vm.properties b/production/testScripts/configuration/sdk.tests/testConfigs/linux32/vm.properties
index 25aa9f028..a18803c2f 100644
--- a/production/testScripts/configuration/sdk.tests/testConfigs/linux32/vm.properties
+++ b/production/testScripts/configuration/sdk.tests/testConfigs/linux32/vm.properties
@@ -8,9 +8,9 @@
 # Contributors:
 #     IBM Corporation - initial API and implementation
 ###############################################################################
-platform=linux.gtk.x86_6.0
-#jvm=/shared/common/jdk-1.6.x86_64/jre/bin/java
+
 jvm=/shared/common/jdk-1.6.0_10/jre/bin/java
+
 # currently this variable is "hard coded" to work on Hudson.
 # not required if no proxies to use or bypass
 # TODO: make more sensitive to env. setttings in future so can
diff --git a/production/testScripts/configuration/sdk.tests/testConfigs/macmini/vm.properties b/production/testScripts/configuration/sdk.tests/testConfigs/macmini/vm.properties
index 9666fa21a..ec10c54b5 100644
--- a/production/testScripts/configuration/sdk.tests/testConfigs/macmini/vm.properties
+++ b/production/testScripts/configuration/sdk.tests/testConfigs/macmini/vm.properties
@@ -8,7 +8,7 @@
 # Contributors:
 #     IBM Corporation - initial API and implementation
 ###############################################################################
-platform=macosx.cocoa.x86_5.0
+
 jvm=/System/Library/Frameworks/JavaVM.framework/Versions/1.5.0/Commands/java
 # currently this variable is "hard coded" to work on Hudson.
 # not required if no proxies to use or bypass
diff --git a/production/testScripts/configuration/sdk.tests/testConfigs/macosx/vm.properties b/production/testScripts/configuration/sdk.tests/testConfigs/macosx/vm.properties
index 264e5ddee..5c626d510 100644
--- a/production/testScripts/configuration/sdk.tests/testConfigs/macosx/vm.properties
+++ b/production/testScripts/configuration/sdk.tests/testConfigs/macosx/vm.properties
@@ -8,8 +8,7 @@
 # Contributors:
 #     IBM Corporation - initial API and implementation
 ###############################################################################
-platform=macosx.cocoa.x86_5.0
-# jvm=/System/Library/Frameworks/JavaVM.framework/Versions/Current/Commands/java
+
 jvm=/Library/Java/JavaVirtualMachines/jdk1.7.0_51.jdk/Contents/Home/jre/bin/java
 # https://bugs.eclipse.org/bugs/show_bug.cgi?id=392213
 # If this property is set, the actual location and file name
diff --git a/production/testScripts/configuration/sdk.tests/testConfigs/win7-64/vm.properties b/production/testScripts/configuration/sdk.tests/testConfigs/win7-64/vm.properties
index 41357f382..ec869df26 100644
--- a/production/testScripts/configuration/sdk.tests/testConfigs/win7-64/vm.properties
+++ b/production/testScripts/configuration/sdk.tests/testConfigs/win7-64/vm.properties
@@ -8,11 +8,8 @@
 # Contributors:
 #     IBM Corporation - initial API and implementation
 ###############################################################################
-#platform=win32.win32.x86_64_6.0
-platform=win32.win32.x86_7.0
+
 jvm=c\:\\java\\jdk7u2\\jre\\bin\\java
-# https://bugs.eclipse.org/bugs/show_bug.cgi?id=390286
-#jvm=c\:\\java\\jdk1.7.0_07\\jre\\bin\\java
 
 # currently this variable is "hard coded" to work on Hudson.
 # not required if no proxies to use or bypass
diff --git a/production/testScripts/configuration/sdk.tests/testConfigs/win7/vm.properties b/production/testScripts/configuration/sdk.tests/testConfigs/win7/vm.properties
index 41357f382..86a9e170f 100644
--- a/production/testScripts/configuration/sdk.tests/testConfigs/win7/vm.properties
+++ b/production/testScripts/configuration/sdk.tests/testConfigs/win7/vm.properties
@@ -8,8 +8,8 @@
 # Contributors:
 #     IBM Corporation - initial API and implementation
 ###############################################################################
-#platform=win32.win32.x86_64_6.0
-platform=win32.win32.x86_7.0
+
+
 jvm=c\:\\java\\jdk7u2\\jre\\bin\\java
 # https://bugs.eclipse.org/bugs/show_bug.cgi?id=390286
 #jvm=c\:\\java\\jdk1.7.0_07\\jre\\bin\\java
diff --git a/production/testScripts/configuration/sdk.tests/testScripts/test.xml b/production/testScripts/configuration/sdk.tests/testScripts/test.xml
index 27d05e97b..563274644 100644
--- a/production/testScripts/configuration/sdk.tests/testScripts/test.xml
+++ b/production/testScripts/configuration/sdk.tests/testScripts/test.xml
@@ -657,70 +657,82 @@
 
   <target
     name="setJVMProperties"
-    depends="setJVMfromUserSpecified">
+    depends="setJVMfromUserSpecified"
+    unless="jvm">
+    <property
+      name="VMSource"
+      value="VM used for tests, is same that invoked Ant: '${java.home}/bin/java' (that is, 'jvm' not specified by caller)." />
+    <echo message="VMSource: $VMSource" />
+    <!--
+        Remember, we don't want J2SE-X.0 set at all, if there is nothing
+        that can run tests that require that level.
+    -->
+
+    <exec
+      executable="${java.home}/bin/java"
+      outputproperty="javaversion">
+      <arg line="-version" />
+    </exec>
+    <echo message="full output from 'java -version' of ${java.home}/bin/java is " />
+    <echo message="${javaversion}" />
+
     <!--enable tests requiring 1.5 or or greater vms to run if running vm level detected matches required execution environment-->
     <condition
       property="J2SE-5.0"
-      value="${java.home}/bin/java"
-      else="NotSet">
+      value="${java.home}/bin/java">
       <matches
         string="${java.version}"
         pattern="^1\.[5678].*$" />
     </condition>
     <condition
       property="J2SE-6.0"
-      value="${java.home}/bin/java"
-      else="NotSet">
+      value="${java.home}/bin/java">
       <matches
         string="${java.version}"
         pattern="^1\.[678].*$" />
     </condition>
     <condition
       property="J2SE-7.0"
-      value="${java.home}/bin/java"
-      else="NotSet">
+      value="${java.home}/bin/java">
       <matches
         string="${java.version}"
         pattern="^1\.[78].*$" />
     </condition>
     <condition
       property="J2SE-8.0"
-      value="${java.home}/bin/java"
-      else="NotSet">
+      value="${java.home}/bin/java">
       <matches
         string="${java.version}"
         pattern="^1\.[8].*$" />
     </condition>
-    <echo level="info" message="DEBUG: values from setJVMProperties" />
-    <echo level="info" message="J2SE-8.0:  ${J2SE-8.0}" />
-    <echo level="info" message="J2SE-7.0:  ${J2SE-7.0}" />
-    <echo level="info" message="J2SE-6.0:  ${J2SE-6.0}" />
-    <echo level="info" message="J2SE-5.0:  ${J2SE-5.0}" />
-  </target>
-
-  <target
-    name="checkAndReporJVM"
-    unless="jvm">
     <echo
       level="info"
-      message="INFO: No user specified jvm was found." />
+      message="DEBUG: values from setJVMProperties" />
+    <echo
+      level="info"
+      message="J2SE-8.0:  ${J2SE-8.0}" />
+    <echo
+      level="info"
+      message="J2SE-7.0:  ${J2SE-7.0}" />
+    <echo
+      level="info"
+      message="J2SE-6.0:  ${J2SE-6.0}" />
+    <echo
+      level="info"
+      message="J2SE-5.0:  ${J2SE-5.0}" />
   </target>
 
   <target
     name="setJVMfromUserSpecified"
-    depends="checkAndReporJVM"
     if="jvm">
-    <echo
-          level="info"
-          message="INFO: User specified jvm value of ${jvm}." />
-    <!--
-       TODO: it is unclear of the purpose (use-case) and relationship of this "user specified" method,
-       compared to the setJVMProperties method above. Here, it seems only one "J2SE-N.M" variable
-       gets a value, depending on how user (or, unit test?) set 'jvm'; where as above,
-       each gets a value, in a "hierarchical" fashion, based on currently running VM..
 
-       Note: here we do NOT want to set "NotSet" if no match, since there is 
-       a second chance to set, in setJVMProperties.
+    <property
+      name="VMSource"
+      value="VM used for tests, specified by caller: 'jvm'=${jvm}" />
+    <echo message="VMSource: $VMSource" />
+    <!--
+        Remember, we don't want J2SE-X.0 set at all, if there is nothing
+        that can run tests that require that level.
     -->
     <exec
       executable="${jvm}"
@@ -735,30 +747,32 @@
       value="${jvm}">
       <matches
         string="${javaversion}"
-        pattern='^java version "1\.[5678].*$' />
+        pattern='^java version "1\.[8].*"' />
     </condition>
     <condition
       property="J2SE-7.0"
       value="${jvm}">
       <matches
         string="${javaversion}"
-        pattern='^java version "1\.[567].*$' />
+        pattern='^java version "1\.[78].*"' />
     </condition>
     <condition
       property="J2SE-6.0"
       value="${jvm}">
       <matches
         string="${javaversion}"
-        pattern='^java version "1\.[56].*$' />
+        pattern='^java version "1\.[678].*"' />
     </condition>
     <condition
       property="J2SE-5.0"
       value="${jvm}">
       <matches
         string="${javaversion}"
-        pattern='^java version "1\.[5].*$' />
+        pattern='^java version "1\.[5678].*"' />
     </condition>
-    <echo message="values from setJVMfromUserSpecified" />
+    <echo
+      level="info"
+      message="DEBUG: values from setJVMfromUserSpecified" />
     <echo message="J2SE-8.0:  ${J2SE-8.0}" />
     <echo message="J2SE-7.0:  ${J2SE-7.0}" />
     <echo message="J2SE-6.0:  ${J2SE-6.0}" />
@@ -1579,19 +1593,13 @@
   -->
   <target
     name="printMainProperties"
-    depends="setJVMProperties"
+    depends="setJVMProperties,getJavaMajorVersion"
     unless="printedMainProperties">
 
     <property
       name="EOL"
       value="${line.separator}" />
 
-    <!-- 
-        Calling getJavaMajorVersion sets the property javaMajorVersion
-     -->
-    <antcall target="getJavaMajorVersion" />
-    <!-- properties to use on test results summary, to be sure accurate -->
-
     <property
       name="platformResults"
       value="${results}/${os}.${ws}.${arch}-${javaMajorVersion}" />
@@ -1724,8 +1732,7 @@
   -->
 
   <target
-    name="getJavaMajorVersion"
-    depends="initOSes">
+    name="getJavaMajorVersion">
   <!-- 
        TODO: this assumes we are running ant, with same VM as we'll eventuall use 
        during test. Valid assumption most the time, but ... not necessarily always.
@@ -1816,19 +1823,18 @@
       value="linux">
       <or>
         <os family="unix" />
-        <os family="linux" />
       </or>
     </condition>
     <!-- if not set above, set to a ridulous value, that will at least give hint of action to take once it causes a failure -->
     <property
       name="guessed.os"
-      value="Value of 'os' could not be determined. 'osgi.os' must be set as system variable." />
+      value="Value of 'os' could not be determined. 'os' must be set as system variable." />
 
     <condition
       property="os"
-      value="${osgi.os}"
+      value="${os}"
       else="${guessed.os}">
-      <isset property="osgi.os" />
+      <isset property="os" />
     </condition>
 
     <!-- luckily, these days, not multiple windowing systems, for common OSes -->
@@ -1850,13 +1856,13 @@
     <!-- if not set above, set to a ridulous value, that will at least give hint of action to take once it causes a failure -->
     <property
       name="guessed.ws"
-      value="Value of 'ws' could not be determined. 'osgi.ws' must be set as system variable." />
+      value="Value of 'ws' could not be determined. 'ws' must be set as system variable." />
 
     <condition
       property="ws"
-      value="${osgi.ws}"
+      value="${ws}"
       else="${guessed.ws}">
-      <isset property="osgi.ws" />
+      <isset property="ws" />
     </condition> 
 
     <!-- not sure this will work well? -->
@@ -1880,13 +1886,13 @@
     <!-- if not set above, set to a ridulous value, that will at least give hint of action to take once it causes a failure -->
     <property
       name="guessed.ws"
-      value="Value of 'arch' could not be determined. 'osgi.arch' must be set as system variable." />
+      value="Value of 'arch' could not be determined. 'arch' must be set as system variable." />
 
     <condition
       property="arch"
-      value="${osgi.arch}"
+      value="${arch}"
       else="${guessed.arch}">
-      <isset property="osgi.arch" />
+      <isset property="arch" />
     </condition>
 
   </target>
@@ -1900,6 +1906,8 @@
     <printProperty property="java.vm.info" />
     <printProperty property="java.specification.version" />
     <printProperty property="java.vendor" />
+    <printProperty property="ant.version" />
+    <printProperty property="ant.java.version" />
     <antcall target="printMainProperties" />
   </target>
 
@@ -1909,9 +1917,6 @@
     <printProperty property="os" />
     <printProperty property="ws" />
     <printProperty property="arch" />
-    <printProperty property="osgi.os" />
-    <printProperty property="osgi.ws" />
-    <printProperty property="osgi.arch" />
   </target>
 
   <target