components/ant/patches/tests.patch
author Rich Burridge <rich.burridge@oracle.com>
Mon, 11 Mar 2013 10:06:51 -0700
changeset 1205 6c6c27bcf9ac
parent 1002 f207010660ab
permissions -rw-r--r--
16431724 Adjust how license text and Oracle internal tracking numbers are propagated
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
1002
f207010660ab 6990622 update apache ant to latest stable release (1.8.4)
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
     1
https://issues.apache.org/bugzilla/show_bug.cgi?id=50507#c10
f207010660ab 6990622 update apache ant to latest stable release (1.8.4)
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
     2
http://svn.apache.org/viewvc?view=revision&revision=1297113
f207010660ab 6990622 update apache ant to latest stable release (1.8.4)
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
     3
f207010660ab 6990622 update apache ant to latest stable release (1.8.4)
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
     4
--- trunk/src/tests/junit/org/apache/tools/ant/taskdefs/ExecTaskTest.java	2012/03/05 16:08:43	1297112
f207010660ab 6990622 update apache ant to latest stable release (1.8.4)
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
     5
+++ trunk/src/tests/junit/org/apache/tools/ant/taskdefs/ExecTaskTest.java	2012/03/05 16:09:56	1297113
f207010660ab 6990622 update apache ant to latest stable release (1.8.4)
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
     6
@@ -103,10 +103,12 @@
f207010660ab 6990622 update apache ant to latest stable release (1.8.4)
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
     7
         logFile = new File(logFile.getAbsolutePath());
f207010660ab 6990622 update apache ant to latest stable release (1.8.4)
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
     8
         assertTrue("log file found after spawn", logFile.exists());
f207010660ab 6990622 update apache ant to latest stable release (1.8.4)
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
     9
     }
f207010660ab 6990622 update apache ant to latest stable release (1.8.4)
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
    10
-    
f207010660ab 6990622 update apache ant to latest stable release (1.8.4)
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
    11
+
f207010660ab 6990622 update apache ant to latest stable release (1.8.4)
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
    12
+    /* XXX #50507 - fails at least on Linux
f207010660ab 6990622 update apache ant to latest stable release (1.8.4)
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
    13
     public void testOutAndErr() {
f207010660ab 6990622 update apache ant to latest stable release (1.8.4)
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
    14
         project.executeTarget("test-out-and-err");
f207010660ab 6990622 update apache ant to latest stable release (1.8.4)
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
    15
     }
f207010660ab 6990622 update apache ant to latest stable release (1.8.4)
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
    16
+    */
f207010660ab 6990622 update apache ant to latest stable release (1.8.4)
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
    17
 
f207010660ab 6990622 update apache ant to latest stable release (1.8.4)
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
    18
     private static class MonitoredBuild implements Runnable {
f207010660ab 6990622 update apache ant to latest stable release (1.8.4)
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
    19
         private Thread worker;