Browse Source

Merge branch '1.9.x'

master
Stefan Bodewig 8 years ago
parent
commit
fea1cfe239
1 changed files with 4 additions and 2 deletions
  1. +4
    -2
      src/tests/junit/org/apache/tools/ant/taskdefs/optional/junit/JUnitTaskTest.java

+ 4
- 2
src/tests/junit/org/apache/tools/ant/taskdefs/optional/junit/JUnitTaskTest.java View File

@@ -485,7 +485,8 @@ public class JUnitTaskTest {
} }
} }
assertTrue("No exports", resExports.isEmpty()); 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 classpath", cp.toString(), resCp);
} }
assertEquals("Expected modulepath", mp.toString(), resMp); assertEquals("Expected modulepath", mp.toString(), resMp);
@@ -541,7 +542,8 @@ public class JUnitTaskTest {
} }
} }
assertTrue("No exports", resExports.isEmpty()); 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); assertNull("No classpath", resCp);
} }
assertEquals("Expected modulepath", mp.toString(), resMp); assertEquals("Expected modulepath", mp.toString(), resMp);


Loading…
Cancel
Save