444 * Sources and classes for the unnamed module are put on the
445 * sourcepath and classpath.
446 * <li>Compilation of classes in a single named user module.
447 * This mode is indicated by the option /module=module-name
448 * where module-name is not the name of a system module.
449 * The output directory should be the appropriate subdirectory
450 * of a module-oriented directory.
451 * The output directory should appear on the classpath.
452 * Sources and classes for the unnamed module are <i>not</i> available.
453 * <li>Compilation of classes to patch those in a system module.
454 * This mode is indicated by the option /module=module-name
455 * where module-name is the name of a system module.
456 * <li>Compilation of classes in one or more named user modules.
457 * This mode is indicated by the option /modules.
458 * The output directory should be a module-oriented directory.
459 * Sources and classes for the unnamed module are put on the
460 * sourcepath and classpath.
461 * </ul>
462 */
463 private List<String> getJavacCommandArgs(List<String> args) throws TestRunException {
464 Map<PathKind, SearchPath> compilePaths = script.getCompilePaths(libLocn, multiModule, module);
465
466 JDKOpts javacArgs = new JDKOpts();
467 javacArgs.addAll(script.getTestCompilerOptions());
468
469 if (isModuleOptionsAllowed(args)) {
470 javacArgs.addAll(getExtraModuleConfigOptions(Modules.Phase.STATIC));
471 }
472
473 if (destDir != null) {
474 javacArgs.add("-d");
475 javacArgs.add(destDir.toString());
476 }
477
478 if (module != null && script.systemModules.contains(module)
479 && !script.useNewPatchModule()) {
480 javacArgs.add("-Xmodule:" + module);
481 }
482
483 // modulesourcepath and sourcepath are mutually exclusive
484 if (multiModule) {
|
444 * Sources and classes for the unnamed module are put on the
445 * sourcepath and classpath.
446 * <li>Compilation of classes in a single named user module.
447 * This mode is indicated by the option /module=module-name
448 * where module-name is not the name of a system module.
449 * The output directory should be the appropriate subdirectory
450 * of a module-oriented directory.
451 * The output directory should appear on the classpath.
452 * Sources and classes for the unnamed module are <i>not</i> available.
453 * <li>Compilation of classes to patch those in a system module.
454 * This mode is indicated by the option /module=module-name
455 * where module-name is the name of a system module.
456 * <li>Compilation of classes in one or more named user modules.
457 * This mode is indicated by the option /modules.
458 * The output directory should be a module-oriented directory.
459 * Sources and classes for the unnamed module are put on the
460 * sourcepath and classpath.
461 * </ul>
462 */
463 private List<String> getJavacCommandArgs(List<String> args) throws TestRunException {
464 Map<PathKind, SearchPath> compilePaths = script.getCompilePaths(libLocn, multiModule, module, destDir);
465
466 JDKOpts javacArgs = new JDKOpts();
467 javacArgs.addAll(script.getTestCompilerOptions());
468
469 if (isModuleOptionsAllowed(args)) {
470 javacArgs.addAll(getExtraModuleConfigOptions(Modules.Phase.STATIC));
471 }
472
473 if (destDir != null) {
474 javacArgs.add("-d");
475 javacArgs.add(destDir.toString());
476 }
477
478 if (module != null && script.systemModules.contains(module)
479 && !script.useNewPatchModule()) {
480 javacArgs.add("-Xmodule:" + module);
481 }
482
483 // modulesourcepath and sourcepath are mutually exclusive
484 if (multiModule) {
|