8140766: langtools/make/test/sym/CreateSymbolsTest.java contains incorrect paths

Fixing paths in CreateSymbolsTest; fixing imports in CreateSymbolsTestImpl.

Reviewed-by: mcimadamore
This commit is contained in:
Jan Lahoda 2015-10-30 17:00:33 +01:00
parent 8fbf915970
commit 2b9c0b888d
2 changed files with 10 additions and 10 deletions

@ -56,21 +56,21 @@ public class CreateSymbolsTest {
Path compileDir = testClasses.resolve("data");
deleteRecursively(compileDir);
Files.createDirectories(compileDir);
Path createSymbols = findFile("../../make/src/build/tools/symbolgenerator/CreateSymbols.java");
Path createSymbols = findFile("../../make/src/classes/build/tools/symbolgenerator/CreateSymbols.java");
if (createSymbols == null) {
System.err.println("Warning: cannot find CreateSymbols, skipping.");
return ;
}
Path createTestImpl = findFile("../../make/test/tools/sym/CreateSymbolsTestImpl.java");
Path createTestImpl = findFile("../../make/test/sym/CreateSymbolsTestImpl.java");
if (createTestImpl == null) {
System.err.println("Warning: cannot find CreateSymbols, skipping.");
System.err.println("Warning: cannot find CreateSymbolsTestImpl, skipping.");
return ;
}
Path toolBox = findFile("../../langtools/test/tools/lib/ToolBox.java");
Path toolBox = findFile("../../test/tools/lib/ToolBox.java");
if (toolBox == null) {
System.err.println("Warning: cannot find ToolBox, skipping.");

@ -41,12 +41,12 @@ import java.util.HashSet;
import java.util.Set;
import java.util.stream.Collectors;
import java.util.stream.Stream;
import symbolgenerator.CreateSymbols;
import symbolgenerator.CreateSymbols.ClassDescription;
import symbolgenerator.CreateSymbols.ClassList;
import symbolgenerator.CreateSymbols.CtSymKind;
import symbolgenerator.CreateSymbols.ExcludeIncludeList;
import symbolgenerator.CreateSymbols.VersionDescription;
import build.tools.symbolgenerator.CreateSymbols;
import build.tools.symbolgenerator.CreateSymbols.ClassDescription;
import build.tools.symbolgenerator.CreateSymbols.ClassList;
import build.tools.symbolgenerator.CreateSymbols.CtSymKind;
import build.tools.symbolgenerator.CreateSymbols.ExcludeIncludeList;
import build.tools.symbolgenerator.CreateSymbols.VersionDescription;
public class CreateSymbolsTestImpl {