--- old/test/jdk/javax/swing/LookAndFeel/SystemLookAndFeel/SystemLookAndFeelTest.java 2020-05-20 18:07:02.726190434 -0700 +++ new/test/jdk/javax/swing/LookAndFeel/SystemLookAndFeel/SystemLookAndFeelTest.java 2020-05-20 18:07:02.394184059 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2019, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2019, 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 @@ -51,7 +51,7 @@ expLAF = "com.sun.java.swing.plaf.windows.WindowsLookAndFeel"; } else if (os.contains("macos")) { expLAF = "com.apple.laf.AquaLookAndFeel"; - } else if (os.contains("linux") || os.contains("sunos")) { + } else if (os.contains("linux")) { /* * The implementation keys off the following desktop setting to * decide if GTK is an appropriate system L&F. @@ -67,8 +67,6 @@ expLAF = "com.sun.java.swing.plaf.gtk.GTKLookAndFeel"; } else if (os.contains("linux")) { expLAF = "javax.swing.plaf.metal.MetalLookAndFeel"; - } else if (os.contains("sunos")) { - expLAF = "com.sun.java.swing.plaf.motif.MotifLookAndFeel"; } } System.out.println("Expected System LAF is " + expLAF);