equal
deleted
inserted
replaced
1 /* |
1 /* |
2 * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved. |
2 * Copyright (c) 2016, 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. |
21 * questions. |
21 * questions. |
22 */ |
22 */ |
23 |
23 |
24 /* |
24 /* |
25 * @test |
25 * @test |
26 * @bug 4906940 8130302 |
26 * @bug 4906940 8130302 8194152 |
27 * @summary -providerPath, -providerClass, -addprovider, and -providerArg |
27 * @summary -providerPath, -providerClass, -addprovider, and -providerArg |
28 * @library /test/lib |
28 * @library /test/lib |
29 * @modules java.base/jdk.internal.misc |
29 * @modules java.base/jdk.internal.misc |
30 * @build jdk.test.lib.util.JarUtils |
30 * @build jdk.test.lib.util.JarUtils |
31 * jdk.test.lib.compiler.CompilerUtils |
31 * jdk.test.lib.compiler.CompilerUtils |
157 |
157 |
158 // Launch a tool with args (space separated string) |
158 // Launch a tool with args (space separated string) |
159 private static OutputAnalyzer tool(String tool, String args) |
159 private static OutputAnalyzer tool(String tool, String args) |
160 throws Throwable { |
160 throws Throwable { |
161 JDKToolLauncher l = JDKToolLauncher.createUsingTestJDK(tool); |
161 JDKToolLauncher l = JDKToolLauncher.createUsingTestJDK(tool); |
|
162 |
|
163 // Set locale to en-US so that the output are not translated into other languages. |
|
164 l.addVMArg("-Duser.language=en"); |
|
165 l.addVMArg("-Duser.country=US"); |
|
166 |
162 for (String a: args.split("\\s+")) { |
167 for (String a: args.split("\\s+")) { |
163 if (a.startsWith("-J")) { |
168 if (a.startsWith("-J")) { |
164 l.addVMArg(a.substring(2)); |
169 l.addVMArg(a.substring(2)); |
165 } else { |
170 } else { |
166 l.addToolArg(a); |
171 l.addToolArg(a); |