test/lib/jdk/test/lib/Platform.java

rev 59103 : imported patch hotspot

*** 111,124 ****
  
      public static boolean isOSX() {
          return isOs("mac");
      }
  
-     public static boolean isSolaris() {
-         return isOs("sunos");
-     }
- 
      public static boolean isWindows() {
          return isOs("win");
      }
  
      private static boolean isOs(String osname) {
--- 111,120 ----
*** 147,164 ****
      public static String getOsVersion() {
          return osVersion;
      }
  
      // Returns major version number from os.version system property.
!     // E.g. 5 on Solaris 10 and 3 on SLES 11.3 (for the linux kernel version).
      public static int getOsVersionMajor() {
          if (osVersionMajor == -1) init_version();
          return osVersionMajor;
      }
  
      // Returns minor version number from os.version system property.
!     // E.g. 10 on Solaris 10 and 0 on SLES 11.3 (for the linux kernel version).
      public static int getOsVersionMinor() {
          if (osVersionMinor == -1) init_version();
          return osVersionMinor;
      }
  
--- 143,160 ----
      public static String getOsVersion() {
          return osVersion;
      }
  
      // Returns major version number from os.version system property.
!     // E.g. 3 on SLES 11.3 (for the linux kernel version).
      public static int getOsVersionMajor() {
          if (osVersionMajor == -1) init_version();
          return osVersionMajor;
      }
  
      // Returns minor version number from os.version system property.
!     // E.g. 0 on SLES 11.3 (for the linux kernel version).
      public static int getOsVersionMinor() {
          if (osVersionMinor == -1) init_version();
          return osVersionMinor;
      }
  
*** 193,209 ****
      // Returns true for IBM z System running linux.
      public static boolean isS390x() {
          return isArch("s390.*") || isArch("s/390.*") || isArch("zArch_64");
      }
  
-     // Returns true for sparc and sparcv9.
-     public static boolean isSparc() {
-         return isArch("sparc.*");
-     }
- 
      public static boolean isX64() {
!         // On OSX it's 'x86_64' and on other (Linux, Windows and Solaris) platforms it's 'amd64'
          return isArch("(amd64)|(x86_64)");
      }
  
      public static boolean isX86() {
          // On Linux it's 'i386', Windows 'x86' without '_64' suffix.
--- 189,200 ----
      // Returns true for IBM z System running linux.
      public static boolean isS390x() {
          return isArch("s390.*") || isArch("s/390.*") || isArch("zArch_64");
      }
  
      public static boolean isX64() {
!         // On OSX it's 'x86_64' and on other (Linux and Windows) platforms it's 'amd64'
          return isArch("(amd64)|(x86_64)");
      }
  
      public static boolean isX86() {
          // On Linux it's 'i386', Windows 'x86' without '_64' suffix.
*** 223,234 ****
       * on this platform.
       */
      public static boolean hasSA() {
          if (isAix()) {
              return false; // SA not implemented.
-         } else if (isSolaris()) {
-             return false; // Testing disabled due to JDK-8193639.
          } else if (isLinux()) {
              if (isS390x() || isARM()) {
                  return false; // SA not implemented.
              }
          }
--- 214,223 ----
*** 359,369 ****
      public static boolean isDefaultCDSArchiveSupported() {
          return (is64bit()  &&
                  isServer() &&
                  (isLinux()   ||
                   isOSX()     ||
-                  isSolaris() ||
                   isWindows()) &&
                  !isZero()    &&
                  !isMinimal() &&
                  !isAArch64() &&
                  !isARM());
--- 348,357 ----
*** 371,378 ****
  
      /*
       * This should match the #if condition in ClassListParser::load_class_from_source().
       */
      public static boolean areCustomLoadersSupportedForCDS() {
!         return (is64bit() && (isLinux() || isSolaris() || isOSX()));
      }
  }
--- 359,366 ----
  
      /*
       * This should match the #if condition in ClassListParser::load_class_from_source().
       */
      public static boolean areCustomLoadersSupportedForCDS() {
!         return (is64bit() && (isLinux() || isOSX()));
      }
  }