< prev index next >
src/share/classes/com/sun/javatest/regtest/exec/RegressionScript.java
Print this page
*** 650,659 ****
--- 650,663 ----
SOURCEPATH
}
Map<PathKind, SearchPath> getCompilePaths(LibLocn libLocn, boolean multiModule, String module)
throws TestRunException {
+ return getCompilePaths(libLocn, multiModule, module, null);
+ }
+ Map<PathKind, SearchPath> getCompilePaths(LibLocn libLocn, boolean multiModule, String module, File destDir)
+ throws TestRunException {
SearchPath bcp = new SearchPath();
SearchPath cp = new SearchPath();
SearchPath mp = new SearchPath();
SearchPath msp = new SearchPath();
SearchPath pp = new SearchPath();
*** 674,685 ****
// in those cases where there are other items on the source path.
cp.append(testSrcDir);
}
}
! if (!multiModule)
cp.append(locations.absTestClsDir());
if (useModulePath()) {
mp.append(locations.absTestModulesDir());
}
--- 678,695 ----
// in those cases where there are other items on the source path.
cp.append(testSrcDir);
}
}
! if (!multiModule) {
! File f = locations.absTestClsDir();
! if (f != null && destDir != null && !f.equals(destDir)) {
! // We are compiling a library -- libraries cannot depend on classes provided by the test!
! } else {
cp.append(locations.absTestClsDir());
+ }
+ }
if (useModulePath()) {
mp.append(locations.absTestModulesDir());
}
< prev index next >