test/java/rmi/testlibrary/JavaVM.java

Print this page
rev 9344 : 8036095: RMI tests using testlibrary.RMID and testlibrary.JavaVM do not pass through vmoptions
Reviewed-by: XXX

*** 1,7 **** /* ! * Copyright (c) 1998, 2013, 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. --- 1,7 ---- /* ! * Copyright (c) 1998, 2014, 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.
*** 122,132 **** if (policyFileName != null) { String option = "-Djava.security.policy=" + policyFileName; addOptions(new String[] { option }); } ! addOptions(new String[] { getCodeCoverageOptions() }); StringTokenizer optionsTokenizer = new StringTokenizer(options); StringTokenizer argsTokenizer = new StringTokenizer(args); int optionsCount = optionsTokenizer.countTokens(); int argsCount = argsTokenizer.countTokens(); --- 122,136 ---- if (policyFileName != null) { String option = "-Djava.security.policy=" + policyFileName; addOptions(new String[] { option }); } ! addOptions(new String[] { ! getCodeCoverageOptions(), ! TestParams.testJavaOpts, ! TestParams.testVmOpts ! }); StringTokenizer optionsTokenizer = new StringTokenizer(options); StringTokenizer argsTokenizer = new StringTokenizer(args); int optionsCount = optionsTokenizer.countTokens(); int argsCount = argsTokenizer.countTokens();