--- old/test/jdk/tools/launcher/TestHelper.java 2020-05-20 18:08:08.591455095 -0700 +++ new/test/jdk/tools/launcher/TestHelper.java 2020-05-20 18:08:08.215447876 -0700 @@ -85,8 +85,6 @@ System.getProperty("sun.arch.data.model").equals("64"); static final boolean is32Bit = System.getProperty("sun.arch.data.model").equals("32"); - static final boolean isSolaris = - System.getProperty("os.name", "unknown").startsWith("SunOS"); static final boolean isLinux = System.getProperty("os.name", "unknown").startsWith("Linux"); static final boolean isAIX = @@ -95,8 +93,6 @@ ? "jvm.dll" : "libjvm" + (isMacOSX ? ".dylib" : ".so"); - static final boolean isSparc = System.getProperty("os.arch").startsWith("sparc"); - // make a note of the golden default locale static final Locale DefaultLocale = Locale.getDefault();