From f074d493c88a9c34e2ce3c1c5c112df2e38a1c66 Mon Sep 17 00:00:00 2001 From: Stepan Koltsov Date: Thu, 14 Jun 2012 22:44:44 +0400 Subject: [PATCH] work around broken kdoc test --- .../jetbrains/jet/cli/jvm/K2JVMCompilerArguments.java | 8 ++++++++ .../kdoc/src/test/kotlin/test/kotlin/kdoc/KDocTest.kt | 10 +++++++++- 2 files changed, 17 insertions(+), 1 deletion(-) diff --git a/compiler/cli/src/org/jetbrains/jet/cli/jvm/K2JVMCompilerArguments.java b/compiler/cli/src/org/jetbrains/jet/cli/jvm/K2JVMCompilerArguments.java index c9d6e83a965..554474a73c1 100644 --- a/compiler/cli/src/org/jetbrains/jet/cli/jvm/K2JVMCompilerArguments.java +++ b/compiler/cli/src/org/jetbrains/jet/cli/jvm/K2JVMCompilerArguments.java @@ -146,6 +146,14 @@ public class K2JVMCompilerArguments extends CompilerArguments { this.stdlib = stdlib; } + public String getMode() { + return mode; + } + + public void setMode(String mode) { + this.mode = mode; + } + @Override public boolean isTags() { return tags; diff --git a/libraries/tools/kdoc/src/test/kotlin/test/kotlin/kdoc/KDocTest.kt b/libraries/tools/kdoc/src/test/kotlin/test/kotlin/kdoc/KDocTest.kt index 9d7c7956886..23bc6da75dc 100644 --- a/libraries/tools/kdoc/src/test/kotlin/test/kotlin/kdoc/KDocTest.kt +++ b/libraries/tools/kdoc/src/test/kotlin/test/kotlin/kdoc/KDocTest.kt @@ -9,6 +9,7 @@ import org.junit.Test import java.io.File import org.junit.Assert import org.jetbrains.jet.cli.common.ExitCode +import java.util.ArrayList /** */ @@ -25,8 +26,15 @@ class KDocTest { println("Generating library KDocs to $outDir") val args = KDocArguments() - args.setModule(moduleName) + //args.setModule(moduleName) + val sourceDirs = ArrayList() + sourceDirs.add("../../stdlib/src") + sourceDirs.add("../../kunit/src/main/kotlin") + sourceDirs.add("../../kotlin-jdbc/src/main/kotlin") + args.setSourceDirs(sourceDirs) args.setOutputDir("target/classes-stdlib") + args.setMode("stdlib") + args.setClasspath("../runtime/target/kotlin-runtime-0.1-SNAPSHOT.jar:../../lib/junit-4.9.jar") val config = args.docConfig config.docOutputDir = outDir.toString()!!