MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

gradle AbstractModelBuilderTests: locate JDK by env variables if tests are running under JRE

Browse Source
This commit is contained in:
nik
2015-05-13 18:27:44 +03:00
parent 14b4055579
commit e3219677d4
2 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/gradle/testSources/org/jetbrains/plugins/gradle/importing/GradleImportingTestCase.java
+1 -1
View File
@@ -112,7 +112,7 @@ public abstract class GradleImportingTestCase extends ExternalSystemImportingTes
}
@Nullable
private static String getJdkHome() {
public static String getJdkHome() {
String javaHome = SystemProperties.getJavaHome();
List<String> paths =
ContainerUtil.packNullables(javaHome, new File(javaHome).getParent(), System.getenv("JDK_16_x64"), System.getenv("JDK_16"));
plugins/gradle/tooling-extension-impl/testSources/org/jetbrains/plugins/gradle/tooling/builder/AbstractModelBuilderTest.java
+5
View File
@@ -31,6 +31,7 @@ import org.gradle.tooling.model.idea.IdeaModule;
import org.gradle.util.GradleVersion;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.plugins.gradle.VersionMatcherRule;
import org.jetbrains.plugins.gradle.importing.GradleImportingTestCase;
import org.jetbrains.plugins.gradle.model.BuildScriptClasspathModel;
import org.jetbrains.plugins.gradle.model.ClasspathEntryModel;
import org.jetbrains.plugins.gradle.model.ProjectImportAction;
@@ -135,6 +136,10 @@ public abstract class AbstractModelBuilderTest {
BuildActionExecuter<ProjectImportAction.AllModels> buildActionExecutor = connection.action(projectImportAction);
File initScript = GradleExecutionHelper.generateInitScript(false, getToolingExtensionClasses());
assertNotNull(initScript);
String jdkHome = GradleImportingTestCase.getJdkHome();
if (jdkHome != null) {
buildActionExecutor.setJavaHome(new File(jdkHome));
}
buildActionExecutor.setJvmArguments("-Xmx64m", "-XX:MaxPermSize=64m");
buildActionExecutor.withArguments("--info", "--recompile-scripts", GradleConstants.INIT_SCRIPT_CMD_OPTION, initScript.getAbsolutePath());
allModels = buildActionExecutor.run();