--- old/test/hotspot/jtreg/test_env.sh	2020-05-20 18:05:13.484092906 -0700
+++ new/test/hotspot/jtreg/test_env.sh	2020-05-20 18:05:13.100085533 -0700
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-#  Copyright (c) 2013, 2016, Oracle and/or its affiliates. All rights reserved.
+#  Copyright (c) 2013, 2020, Oracle and/or its affiliates. All rights reserved.
 #  DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
 #  This code is free software; you can redistribute it and/or modify it
@@ -56,7 +56,7 @@
 # set platform-dependent variables
 OS=`uname -s`
 case "$OS" in
-  AIX | Darwin | Linux | SunOS )
+  AIX | Darwin | Linux )
     NULL=/dev/null
     PS=":"
     FS="/"
@@ -149,11 +149,6 @@
 then
   VM_OS="linux"
 fi
-grep "solaris" vm_version.out > ${NULL}
-if [ $? = 0 ]
-then
-  VM_OS="solaris"
-fi
 grep "windows" vm_version.out > ${NULL}
 if [ $? = 0 ]
 then
@@ -161,15 +156,6 @@
 fi
 
 VM_CPU="unknown"
-grep "sparc" vm_version.out > ${NULL}
-if [ $? = 0 ]
-then
-  VM_CPU="sparc"
-  if [ $VM_BITS = "64" ]
-  then
-    VM_CPU="sparcv9"
-  fi
-fi
 grep "x86" vm_version.out > ${NULL}
 if [ $? = 0 ]
 then