equal
deleted
inserted
replaced
1 /* |
1 /* |
2 * Copyright (c) 2015, 2017, Oracle and/or its affiliates. All rights reserved. |
2 * Copyright (c) 2015, 2018, Oracle and/or its affiliates. All rights reserved. |
3 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. |
3 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. |
4 * |
4 * |
5 * This code is free software; you can redistribute it and/or modify it |
5 * This code is free software; you can redistribute it and/or modify it |
6 * under the terms of the GNU General Public License version 2 only, as |
6 * under the terms of the GNU General Public License version 2 only, as |
7 * published by the Free Software Foundation. |
7 * published by the Free Software Foundation. |
148 } else { |
148 } else { |
149 limitMods = LIMIT_MODULES[includeModIdx]; |
149 limitMods = LIMIT_MODULES[includeModIdx]; |
150 } |
150 } |
151 } |
151 } |
152 } |
152 } |
153 output = TestCommon.exec( |
153 TestCommon.run( |
154 appJar + File.pathSeparator + helperJar, |
154 "-cp", appJar + File.pathSeparator + helperJar, |
155 "-XX:+UnlockDiagnosticVMOptions", "-XX:+WhiteBoxAPI", bootClassPath, |
155 "-XX:+UnlockDiagnosticVMOptions", "-XX:+WhiteBoxAPI", bootClassPath, |
156 "--limit-modules", limitMods, |
156 "--limit-modules", limitMods, |
157 "LimitModsHelper", |
157 "LimitModsHelper", |
158 BOOT_ARCHIVE_CLASS, PLATFORM_ARCHIVE_CLASS, APP_ARCHIVE_CLASS, |
158 BOOT_ARCHIVE_CLASS, PLATFORM_ARCHIVE_CLASS, APP_ARCHIVE_CLASS, |
159 Integer.toString(excludeModIdx)); // last 4 args passed to test |
159 Integer.toString(excludeModIdx)) // last 4 args passed to test |
160 TestCommon.checkExec(output); |
160 .assertSilentlyDisabledCDS(0); |
161 limitMods = null; |
161 limitMods = null; |
162 } |
162 } |
163 } |
163 } |
164 } |
164 } |