From 8e0075aad203cb89bc6ed519e3e389734e8f9007 Mon Sep 17 00:00:00 2001 From: Tom Bentley Date: Mon, 16 Nov 2015 13:09:03 +0000 Subject: [PATCH] compiler-java: Fixup for SDK overrides Part of #5734 --- .../com/redhat/ceylon/ceylondoc/test/CeylonDocToolTests.java | 2 +- .../com/redhat/ceylon/compiler/java/test/misc/MiscTests.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/compiler-java/test/ceylondoc/com/redhat/ceylon/ceylondoc/test/CeylonDocToolTests.java b/compiler-java/test/ceylondoc/com/redhat/ceylon/ceylondoc/test/CeylonDocToolTests.java index ed020d5522f..25ef1a02f06 100644 --- a/compiler-java/test/ceylondoc/com/redhat/ceylon/ceylondoc/test/CeylonDocToolTests.java +++ b/compiler-java/test/ceylondoc/com/redhat/ceylon/ceylondoc/test/CeylonDocToolTests.java @@ -537,7 +537,7 @@ public void ceylonSdk() throws Exception { CeylonDocTool tool = tool(Arrays.asList(new File("../../ceylon-sdk/source")), new String[0], - "../ceylon-sdk/overrides.xml", + "../../ceylon-sdk/overrides.xml", Collections.emptyList(), Arrays.asList(fullModuleNames), true, false, false); tool.setIncludeNonShared(false); diff --git a/compiler-java/test/src/com/redhat/ceylon/compiler/java/test/misc/MiscTests.java b/compiler-java/test/src/com/redhat/ceylon/compiler/java/test/misc/MiscTests.java index c8c73961798..5c9a0ef8b87 100755 --- a/compiler-java/test/src/com/redhat/ceylon/compiler/java/test/misc/MiscTests.java +++ b/compiler-java/test/src/com/redhat/ceylon/compiler/java/test/misc/MiscTests.java @@ -336,7 +336,7 @@ private void compileSDKOnly(String[] modules, String[] extraModules){ CeyloncTaskImpl task = (CeyloncTaskImpl) compiler.getTask(null, fileManager, errorCollector, Arrays.asList("-sourcepath", sourceDir, "-d", "build/classes-sdk", "-suppress-warnings", "ceylonNamespace", - "-overrides", "../ceylon-sdk/overrides.xml", + "-overrides", "../../ceylon-sdk/overrides.xml", "-cp", getClassPathAsPath()), moduleNames, null); Boolean result = task.call();