From f0322a2f4bb15199a55942cc3e6d1a51a26922eb Mon Sep 17 00:00:00 2001
From: Stefan Bodewig <bodewig@apache.org>
Date: Fri, 26 Jan 2018 20:30:10 +0100
Subject: [PATCH] Java9 tool location changes now show up on Jenkins

---
 .../junit/org/apache/tools/ant/util/JavaEnvUtilsTest.java     | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/tests/junit/org/apache/tools/ant/util/JavaEnvUtilsTest.java b/src/tests/junit/org/apache/tools/ant/util/JavaEnvUtilsTest.java
index cd479d5aa..db4e4af63 100644
--- a/src/tests/junit/org/apache/tools/ant/util/JavaEnvUtilsTest.java
+++ b/src/tests/junit/org/apache/tools/ant/util/JavaEnvUtilsTest.java
@@ -67,7 +67,11 @@ public class JavaEnvUtilsTest {
             assertTrue(j + " is absolute", (new File(j)).isAbsolute());
             String javaHomeParent = FILE_UTILS.normalize(javaHome + "/..").getAbsolutePath();
             assertTrue(j + " is normalized and in the JDK dir", j.startsWith(javaHomeParent));
+            if (JavaEnvUtils.isAtLeastJavaVersion(JavaEnvUtils.JAVA_9)) {
+            assertTrue(j + " is normalized and not in the JRE dir", j.startsWith(javaHome));
+            } else {
             assertTrue(j + " is normalized and not in the JRE dir", !j.startsWith(javaHome));
+            }
         } catch (AssertionError e) {
             // java.home is bogus
             assertEquals("javac.exe", j);