If initialization determines that the corresponding target could not run,

bail out of the test (pass).


git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@276110 13f79535-47bb-0310-9956-ffa450edef68

src/testcases/org/apache/tools/ant/taskdefs/ExecTaskTest.java

@@ -59,12 +59,19 @@ public class ExecTaskTest extends BuildFileTest {
     }
 
     public void testNoRedirect() {
-        expectLog("no-redirect", getProject().getProperty("ant.file") + " out"
-            + getProject().getProperty("ant.file") + " err");
+        executeTarget("no-redirect");
+        if (getProject().getProperty("test.can.run") == null) {
+            return;
+        }
+        assertEquals(getProject().getProperty("ant.file") + " out"
+            + getProject().getProperty("ant.file") + " err", getLog());
     }
 
     public void testRedirect1() {
         executeTarget("redirect1");
+        if (getProject().getProperty("test.can.run") == null) {
+            return;
+        }
         String expectedOut = getProject().getProperty("ant.file") + " out\n"
             + getProject().getProperty("ant.file") + " err\n";
 
@@ -79,6 +86,9 @@ public class ExecTaskTest extends BuildFileTest {
 
     public void testRedirect2() {
         executeTarget("redirect2");
+        if (getProject().getProperty("test.can.run") == null) {
+            return;
+        }
         String expectedOut = getProject().getProperty("ant.file") + " out\n";
         String expectedErr = getProject().getProperty("ant.file") + " err\n";
 
@@ -96,7 +106,11 @@ public class ExecTaskTest extends BuildFileTest {
     }
 
     public void testRedirect3() {
-        expectLog("redirect3", getProject().getProperty("ant.file") + " err");
+        executeTarget("redirect3");
+        if (getProject().getProperty("test.can.run") == null) {
+            return;
+        }
+        assertEquals(getProject().getProperty("ant.file") + " err", getLog());
         String expectedOut = getProject().getProperty("ant.file") + " out\n";
 
         String actualOut = null;
@@ -111,6 +125,9 @@ public class ExecTaskTest extends BuildFileTest {
 
     public void testRedirect4() {
         executeTarget("redirect4");
+        if (getProject().getProperty("test.can.run") == null) {
+            return;
+        }
         String expectedOut = getProject().getProperty("ant.file") + " out\n";
         String expectedErr = getProject().getProperty("ant.file") + " err\n";
 
@@ -139,6 +156,9 @@ public class ExecTaskTest extends BuildFileTest {
 
     public void testRedirect5or6(String target) {
         executeTarget(target);
+        if (getProject().getProperty("wc.can.run") == null) {
+            return;
+        }
 
         String expectedOut = getProject().getProperty("ant.file") + " out\n";
 
@@ -159,6 +179,9 @@ public class ExecTaskTest extends BuildFileTest {
 
     public void testRedirect7() {
         executeTarget("redirect7");
+        if (getProject().getProperty("wc.can.run") == null) {
+            return;
+        }
 
         String expectedOut = getProject().getProperty("ant.file") + " out\n";
 

src/testcases/org/apache/tools/ant/taskdefs/ExecuteOnTest.java

@@ -49,6 +49,10 @@ public class ExecuteOnTest extends BuildFileTest {
 
     public void testNoRedirect() {
         executeTarget("no-redirect");
+        if (getProject().getProperty("test.can.run") == null) {
+            return;
+        }
+
         String log = getLog();
         File x = getProject().resolveFile("x");
         File y = getProject().resolveFile("y");
@@ -73,6 +77,9 @@ public class ExecuteOnTest extends BuildFileTest {
 
     public void testRedirect1() {
         executeTarget("redirect1");
+        if (getProject().getProperty("test.can.run") == null) {
+            return;
+        }
         String actualOut = null;
         try {
             actualOut = FileUtils.newFileUtils().readFully(new FileReader(
@@ -102,6 +109,9 @@ public class ExecuteOnTest extends BuildFileTest {
 
     public void testRedirect2() {
         executeTarget("redirect2");
+        if (getProject().getProperty("test.can.run") == null) {
+            return;
+        }
         String actualOut = null;
         String actualErr = null;
         try {
@@ -134,6 +144,9 @@ public class ExecuteOnTest extends BuildFileTest {
 
     public void testRedirect3() {
         executeTarget("redirect3");
+        if (getProject().getProperty("test.can.run") == null) {
+            return;
+        }
         String actualOut = null;
         try {
             actualOut = FileUtils.newFileUtils().readFully(new FileReader(
@@ -164,6 +177,9 @@ public class ExecuteOnTest extends BuildFileTest {
 
     public void testRedirect4() {
         executeTarget("redirect4");
+        if (getProject().getProperty("test.can.run") == null) {
+            return;
+        }
         String actualOut = null;
         String actualErr = null;
         try {
@@ -206,6 +222,9 @@ public class ExecuteOnTest extends BuildFileTest {
 
     private void testRedirect5or6(String target) {
         executeTarget(target);
+        if (getProject().getProperty("sed.can.run") == null) {
+            return;
+        }
         String actualOut = null;
         String actualErr = null;
         try {
@@ -224,6 +243,9 @@ public class ExecuteOnTest extends BuildFileTest {
 
     public void testRedirect7() {
         executeTarget("redirect7");
+        if (getProject().getProperty("sed.can.run") == null) {
+            return;
+        }
         String actualOut = null;
         String actualErr = null;
         try {