# HG changeset patch
# User iklam
# Date 1508277730 0
# Node ID 7852e65127e4ca93e0f1ede1524fa7b8e16f32f5
# Parent  cccfa7339755f331061c22907d013f5bf08cc06c# Parent  ad6a219f8b95a4ae9f3f59d428bd9af623901245
Merge

diff -r cccfa7339755 -r 7852e65127e4 test/hotspot/jtreg/runtime/getSysPackage/GetSysPkgTest.java
--- a/test/hotspot/jtreg/runtime/getSysPackage/GetSysPkgTest.java	Tue Oct 17 13:52:52 2017 -0700
+++ b/test/hotspot/jtreg/runtime/getSysPackage/GetSysPkgTest.java	Tue Oct 17 22:02:10 2017 +0000
@@ -25,7 +25,7 @@
  * @test
  * @modules java.base/jdk.internal.misc
  * @modules java.base/jdk.internal.loader
- *          java.desktop
+ *          java.logging
  * @library /test/lib
  * @run main/othervm GetSysPkgTest
  */
@@ -134,10 +134,11 @@
         getPkg("GetSysPkg_package", null);
 
         // Access a class with a package in a boot loader module other than java.base
-        clss = Class.forName("java.awt.Button");
+        clss = Class.forName("java.util.logging.Level");
+
         if (clss == null)
-            throw new RuntimeException("Could not find class java.awt.Button");
-        getPkg("java/awt", "jrt:/java.desktop");
+            throw new RuntimeException("Could not find class java.util.logging.Level");
+        getPkg("java/util/logging", "jrt:/java.logging");
 
         // Test getting the package location from a class found via -Xbootclasspath/a
         clss = Class.forName("BootLdr_package.BootLdrPkg");