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

KJS: fix wrongAbiVersion test after abi version was increased. Make it less fragile with the hack for JS tests.

Browse Source
This commit is contained in:
Zalim Bashorov
2016-10-19 21:02:07 +03:00
parent f22a507e39
commit bdecb661e3
3 changed files with 18 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/testData/cli/js/wrongAbiVersion.out
Vendored
+1 -1
View File
@@ -1,2 +1,2 @@
error: file 'compiler/testData/cli/js/wrongAbiVersionLib/wrongAbiLib.meta.js' was compiled with an incompatible version of Kotlin. Its ABI version is 0, expected ABI version is 4
error: file 'compiler/testData/cli/js/wrongAbiVersionLib/wrongAbiLib.meta.js' was compiled with an incompatible version of Kotlin. Its ABI version is 0, expected version is $ABI_VERSION$
COMPILATION_ERROR
compiler/tests/org/jetbrains/kotlin/cli/AbstractCliTest.java
+16 -4
View File
@@ -35,6 +35,7 @@ import org.jetbrains.kotlin.test.InTextDirectivesUtils;
import org.jetbrains.kotlin.test.KotlinTestUtils;
import org.jetbrains.kotlin.test.TestCaseWithTmpdir;
import org.jetbrains.kotlin.utils.ExceptionUtilsKt;
import org.jetbrains.kotlin.utils.KotlinJavascriptMetadataUtils;
import org.jetbrains.kotlin.utils.PathUtil;
import org.jetbrains.kotlin.utils.StringsKt;
import org.junit.Assert;
@@ -81,11 +82,11 @@ public abstract class AbstractCliTest extends TestCaseWithTmpdir {
return normalizedOutputWithoutExitCode + exitCode;
}
private void doTest(@NotNull String fileName, @NotNull CLICompiler<?> compiler) throws Exception {
private void doTest(@NotNull String fileName, @NotNull CLICompiler<?> compiler, BinaryVersion version) throws Exception {
System.setProperty("java.awt.headless", "true");
Pair<String, ExitCode> outputAndExitCode = executeCompilerGrabOutput(compiler, readArgs(fileName, tmpdir.getPath()));
String actual = getNormalizedCompilerOutput(
outputAndExitCode.getFirst(), outputAndExitCode.getSecond(), new File(fileName).getParent(), JvmMetadataVersion.INSTANCE
outputAndExitCode.getFirst(), outputAndExitCode.getSecond(), new File(fileName).getParent(), version
);
File outFile = new File(fileName.replaceFirst("\\.args$", ".out"));
@@ -151,11 +152,22 @@ public abstract class AbstractCliTest extends TestCaseWithTmpdir {
}
protected void doJvmTest(@NotNull String fileName) throws Exception {
doTest(fileName, new K2JVMCompiler());
doTest(fileName, new K2JVMCompiler(), JvmMetadataVersion.INSTANCE);
}
protected void doJsTest(@NotNull String fileName) throws Exception {
doTest(fileName, new K2JSCompiler());
doTest(fileName, new K2JSCompiler(), new BinaryVersion() {
@Override
public boolean isCompatible() {
throw new UnsupportedOperationException();
}
@NotNull
@Override
public String toString() {
return String.valueOf(KotlinJavascriptMetadataUtils.ABI_VERSION);
}
});
}
public static String removePerfOutput(String output) {
js/js.frontend/src/org/jetbrains/kotlin/js/config/LibrarySourcesConfig.java
+1 -1
View File
@@ -144,7 +144,7 @@ public class LibrarySourcesConfig extends JsConfig {
if (!metadata.isAbiVersionCompatible()) {
report.invoke("File '" + path + "' was compiled with an incompatible version of Kotlin. " +
"Its ABI version is " + metadata.getAbiVersion() +
", expected ABI version is " + KotlinJavascriptMetadataUtils.ABI_VERSION);
", expected version is " + KotlinJavascriptMetadataUtils.ABI_VERSION);
return true;
}
}