test/lib/jdk/test/lib/OSVersion.java

rev 59189 : imported patch hotspot

*** 44,56 ****
      public static final OSVersion WINDOWS_VISTA = new OSVersion(6, 0);
  
      private final int[] versionTokens;
  
      public static OSVersion current() {
-         if (Platform.isSolaris()) {
-             return new OSVersion(getSolarisVersion());
-         }
          return new OSVersion(Platform.getOsVersion());
      }
  
      public OSVersion(int major, int minor) {
          versionTokens = new int[] {major, minor};
--- 44,53 ----
*** 62,91 ****
                                     .filter(onlyDigits.asPredicate())
                                     .mapToInt(Integer::parseInt)
                                     .toArray();
      }
  
-     private static String getSolarisVersion() {
-         try {
-             return Utils.distro();
-         } catch (Throwable e) {
-             System.out.println("First attempt failed with: " + e.getMessage());
-         }
- 
-         // Try to get Solaris version from /etc/release
-         try (BufferedReader in = new BufferedReader(AccessController.doPrivileged(
-                 (PrivilegedExceptionAction<FileReader>) () -> new FileReader("/etc/release")))) {
-             return in.readLine().trim().split(" ")[2];
-         } catch (PrivilegedActionException e) {
-             System.out.println("Second attempt failed with: " + e.getException().getMessage());
-         } catch (Exception e) {
-             System.out.println("Second attempt failed with: " + e.getMessage());
-         }
- 
-         throw new RuntimeException("Unable to get Solaris version");
-     }
- 
      @Override
      public int compareTo(OSVersion o) {
          return Arrays.compare(this.versionTokens, o.versionTokens);
      }
  
--- 59,68 ----