From c385fc66ff46ad604e59c15212014bf3fa655575 Mon Sep 17 00:00:00 2001
From: Stefan Bodewig <bodewig@apache.org>
Date: Mon, 24 Oct 2016 14:35:44 +0200
Subject: [PATCH] next attempt at fixing Gump build

---
 .../tools/ant/taskdefs/optional/junit/JUnitTaskTest.java    | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/tests/junit/org/apache/tools/ant/taskdefs/optional/junit/JUnitTaskTest.java b/src/tests/junit/org/apache/tools/ant/taskdefs/optional/junit/JUnitTaskTest.java
index 9787aabae..8a36452ef 100644
--- a/src/tests/junit/org/apache/tools/ant/taskdefs/optional/junit/JUnitTaskTest.java
+++ b/src/tests/junit/org/apache/tools/ant/taskdefs/optional/junit/JUnitTaskTest.java
@@ -485,7 +485,8 @@ public class JUnitTaskTest {
                 }
             }
             assertTrue("No exports", resExports.isEmpty());
-            if (System.getProperty(MagicNames.BUILD_SYSCLASSPATH) == null) {
+            if (project.getProperty(MagicNames.BUILD_SYSCLASSPATH) == null
+                && System.getProperty(MagicNames.BUILD_SYSCLASSPATH) == null) {
                 assertEquals("Expected classpath", cp.toString(), resCp);
             }
             assertEquals("Expected modulepath", mp.toString(), resMp);
@@ -541,7 +542,8 @@ public class JUnitTaskTest {
                 }
             }
             assertTrue("No exports", resExports.isEmpty());
-            if (System.getProperty(MagicNames.BUILD_SYSCLASSPATH) == null) {
+            if (project.getProperty(MagicNames.BUILD_SYSCLASSPATH) == null
+                && System.getProperty(MagicNames.BUILD_SYSCLASSPATH) == null) {
                 assertNull("No classpath", resCp);
             }
             assertEquals("Expected modulepath", mp.toString(), resMp);