ant-notifications mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bode...@apache.org
Subject ant git commit: next attempt at fixing Gump build
Date Mon, 24 Oct 2016 12:36:08 GMT
Repository: ant
Updated Branches:
  refs/heads/1.9.x 8cf0c0bb4 -> c385fc66f


next attempt at fixing Gump build


Project: http://git-wip-us.apache.org/repos/asf/ant/repo
Commit: http://git-wip-us.apache.org/repos/asf/ant/commit/c385fc66
Tree: http://git-wip-us.apache.org/repos/asf/ant/tree/c385fc66
Diff: http://git-wip-us.apache.org/repos/asf/ant/diff/c385fc66

Branch: refs/heads/1.9.x
Commit: c385fc66ff46ad604e59c15212014bf3fa655575
Parents: 8cf0c0b
Author: Stefan Bodewig <bodewig@apache.org>
Authored: Mon Oct 24 14:35:44 2016 +0200
Committer: Stefan Bodewig <bodewig@apache.org>
Committed: Mon Oct 24 14:35:44 2016 +0200

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


http://git-wip-us.apache.org/repos/asf/ant/blob/c385fc66/src/tests/junit/org/apache/tools/ant/taskdefs/optional/junit/JUnitTaskTest.java
----------------------------------------------------------------------
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 9787aab..8a36452 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);


Mime
View raw message