diff -r 9e16600b5dcb -r e16d4c844e76 jdk/test/java/rmi/testlibrary/RMID.java --- a/jdk/test/java/rmi/testlibrary/RMID.java Thu Mar 06 10:41:10 2014 -0800 +++ b/jdk/test/java/rmi/testlibrary/RMID.java Thu Mar 06 14:26:26 2014 -0800 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1998, 2013, Oracle and/or its affiliates. All rights reserved. + * 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 @@ -117,6 +117,18 @@ args += " -C-Dtest.classes=" + TestParams.testClasses; } + if (!TestParams.testJavaOpts.equals("")) { + for (String a : TestParams.testJavaOpts.split(" +")) { + args += " -C" + a; + } + } + + if (!TestParams.testVmOpts.equals("")) { + for (String a : TestParams.testVmOpts.split(" +")) { + args += " -C" + a; + } + } + args += " -C-Djava.rmi.server.useCodebaseOnly=false "; args += " " + getCodeCoverageArgs();