From fc3fc3210a70101e05bbf9a43e54c966e7c6f62f Mon Sep 17 00:00:00 2001 From: "Egor.Ushakov" Date: Tue, 15 Aug 2017 17:21:06 +0300 Subject: [PATCH] fixed tests on jdk9 --- .../src/com/intellij/debugger/impl/OutputChecker.java | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/java/testFramework/src/com/intellij/debugger/impl/OutputChecker.java b/java/testFramework/src/com/intellij/debugger/impl/OutputChecker.java index 7f1a78121f1a..825160e0cedd 100644 --- a/java/testFramework/src/com/intellij/debugger/impl/OutputChecker.java +++ b/java/testFramework/src/com/intellij/debugger/impl/OutputChecker.java @@ -21,6 +21,7 @@ import com.intellij.openapi.application.Application; import com.intellij.openapi.application.ApplicationManager; import com.intellij.openapi.application.PathManager; import com.intellij.openapi.diagnostic.Logger; +import com.intellij.openapi.projectRoots.JavaSdkVersion; import com.intellij.openapi.projectRoots.Sdk; import com.intellij.openapi.projectRoots.ex.JavaSdkUtil; import com.intellij.openapi.projectRoots.impl.JavaAwareProjectJdkTableImpl; @@ -113,6 +114,12 @@ public class OutputChecker { assert outs.exists() || outs.mkdirs() : outs; File outFile = new File(outs, myTestName + ".out"); + if (JavaSdkUtil.isJdkAtLeast(jdk, JavaSdkVersion.JDK_1_9)) { + File jdk9Out = new File(outs, myTestName + ".jdk9.out"); + if (jdk9Out.exists()) { + outFile = jdk9Out; + } + } if (!outFile.exists()) { if (SystemInfo.isWindows) { final File winOut = new File(outs, myTestName + ".win.out");