test/hotspot/jtreg/runtime/appcds/jigsaw/classpathtests/DummyClassesInBootClassPath.java
Index Unified diffs Context diffs Sdiffs Wdiffs Patch New Old Previous File Next File
*** old/test/hotspot/jtreg/runtime/appcds/jigsaw/classpathtests/DummyClassesInBootClassPath.java	Fri Jan 26 14:38:47 2018
--- new/test/hotspot/jtreg/runtime/appcds/jigsaw/classpathtests/DummyClassesInBootClassPath.java	Fri Jan 26 14:38:47 2018

*** 1,7 **** --- 1,7 ---- /* ! * Copyright (c) 2015, 2017, Oracle and/or its affiliates. All rights reserved. ! * Copyright (c) 2015, 2018, 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 * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation.
*** 50,87 **** --- 50,92 ---- "javax/activation/MimeType"}; JarBuilder.build("dummyClasses", classNames[0], classNames[1]); String appJar = TestCommon.getTestJar("dummyClasses.jar"); OutputAnalyzer dumpOutput = TestCommon.dump( ! appJar, classNames, "-Xbootclasspath/a:" + appJar); ! appJar, classNames, "-Xbootclasspath/a:" + appJar, + "--add-modules", "java.activation"); List<String> argsList = new ArrayList<String>(); for (int i = 0; i < classNames.length; i++) { argsList.add(classNames[i].replace('/', '.')); } String[] arguments = new String[argsList.size()]; arguments = argsList.toArray(arguments); OutputAnalyzer execOutput = TestCommon.execCommon( ! "-cp", TestCommon.getTestDir("."), "-verbose:class", "--add-modules", "java.activation", "-Xbootclasspath/a:" + appJar, "DummyClassHelper", arguments[0], arguments[1]); ! "--add-modules", "java.activation", "-Xbootclasspath/a:" + appJar, + "DummyClassHelper", arguments[0], arguments[1]); for (int i = 0; i < arguments.length; i++) { TestCommon.checkExec(execOutput, "java.lang.NoSuchMethodException: " + arguments[i] + "." + METHOD_NAME); } JarBuilder.build(true, "WhiteBox", "sun/hotspot/WhiteBox"); String whiteBoxJar = TestCommon.getTestJar("WhiteBox.jar"); String bootClassPath = "-Xbootclasspath/a:" + appJar + File.pathSeparator + whiteBoxJar; + dumpOutput = TestCommon.dump( + appJar, classNames, bootClassPath, "--add-modules", "java.activation"); argsList.add("testWithWhiteBox"); arguments = new String[argsList.size()]; arguments = argsList.toArray(arguments); String[] opts = {"-XX:+UnlockDiagnosticVMOptions", "-XX:+WhiteBoxAPI", ! bootClassPath, "-XX:+TraceClassPaths", "DummyClassHelper", ! arguments[0], arguments[1], arguments[2]}; ! OutputAnalyzer output = TestCommon.execCommon(opts); ! "--add-modules", "java.activation", bootClassPath, "-XX:+TraceClassPaths", ! "DummyClassHelper", arguments[0], arguments[1], arguments[2]}; ! execOutput = TestCommon.execCommon(opts); + for (int i = 0; i < arguments.length - 1; i++) { + TestCommon.checkExec(execOutput, + "java.lang.NoSuchMethodException: " + arguments[i] + "." + + METHOD_NAME); + } } }

test/hotspot/jtreg/runtime/appcds/jigsaw/classpathtests/DummyClassesInBootClassPath.java
Index Unified diffs Context diffs Sdiffs Wdiffs Patch New Old Previous File Next File