azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

explain why tests fail for new checkout

Browse Source
This commit is contained in:
Dmitry Jemerov
2012-07-10 19:41:11 +02:00
parent 4ece44728d
commit f49232cdf3
1 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/tests/org/jetbrains/jet/codegen/forTestCompile/ForTestPackJdkAnnotations.java
+8 -5
View File
@@ -16,8 +16,6 @@
package org.jetbrains.jet.codegen.forTestCompile; package org.jetbrains.jet.codegen.forTestCompile;
import com.google.common.io.Files;
import com.intellij.openapi.util.Pair;
import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.NotNull;
import org.jetbrains.jet.JetTestUtils; import org.jetbrains.jet.JetTestUtils;
@@ -25,8 +23,6 @@ import java.io.BufferedOutputStream;
import java.io.File; import java.io.File;
import java.io.FileOutputStream; import java.io.FileOutputStream;
import java.io.IOException; import java.io.IOException;
import java.util.Stack;
import java.util.jar.JarEntry;
import java.util.jar.JarOutputStream; import java.util.jar.JarOutputStream;
/** /**
@@ -67,6 +63,13 @@ public class ForTestPackJdkAnnotations {
@NotNull @NotNull
public static File jdkAnnotationsForTests() { public static File jdkAnnotationsForTests() {
return ForTestCompileSomething.ACTUALLY_COMPILE ? getJarFile() : new File("dist/kotlinc/lib/alt/kotlin-jdk-annotations.jar"); if (ForTestCompileSomething.ACTUALLY_COMPILE) {
return getJarFile();
}
final File jdkAnnotations = new File("dist/kotlinc/lib/alt/kotlin-jdk-annotations.jar");
if (!jdkAnnotations.exists()) {
throw new RuntimeException("Kotlin JDK annotations jar not found; please run 'ant dist' to build it");
}
return jdkAnnotations;
} }
} }