From 330532661bea4cf0613aa9b0799b9423dbd1370a Mon Sep 17 00:00:00 2001 From: pTalanov Date: Sat, 28 Apr 2012 19:26:32 +0400 Subject: [PATCH] Merge with master. --- compiler/tests/org/jetbrains/jet/JetTestUtils.java | 2 +- .../longTest/ResolveDescriptorsFromExternalLibraries.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/compiler/tests/org/jetbrains/jet/JetTestUtils.java b/compiler/tests/org/jetbrains/jet/JetTestUtils.java index 2c50e749a06..a0e9b7d4442 100644 --- a/compiler/tests/org/jetbrains/jet/JetTestUtils.java +++ b/compiler/tests/org/jetbrains/jet/JetTestUtils.java @@ -234,7 +234,7 @@ public class JetTestUtils { public static final Pattern FILE_PATTERN = Pattern.compile("//\\s*FILE:\\s*(.*)$", Pattern.MULTILINE); public static JetCoreEnvironment createEnvironmentWithFullJdk(Disposable disposable) { - return new JetCoreEnvironment(disposable, + return JetCoreEnvironment.getCoreEnvironmentForJVM(disposable, CompileCompilerDependenciesTest.compilerDependenciesForTests(CompilerSpecialMode.REGULAR, false)); } diff --git a/compiler/tests/org/jetbrains/jet/cli/jvm/compiler/longTest/ResolveDescriptorsFromExternalLibraries.java b/compiler/tests/org/jetbrains/jet/cli/jvm/compiler/longTest/ResolveDescriptorsFromExternalLibraries.java index a3fc26459bf..a6555c17113 100644 --- a/compiler/tests/org/jetbrains/jet/cli/jvm/compiler/longTest/ResolveDescriptorsFromExternalLibraries.java +++ b/compiler/tests/org/jetbrains/jet/cli/jvm/compiler/longTest/ResolveDescriptorsFromExternalLibraries.java @@ -100,7 +100,7 @@ public class ResolveDescriptorsFromExternalLibraries { } else { CompilerDependencies compilerDependencies = CompileCompilerDependenciesTest.compilerDependenciesForTests(CompilerSpecialMode.REGULAR, false); - jetCoreEnvironment = new JetCoreEnvironment(junk, compilerDependencies); + jetCoreEnvironment = JetCoreEnvironment.getCoreEnvironmentForJVM(junk, compilerDependencies); jar = compilerDependencies.getJdkJar(); }