# HG changeset patch
# User Doug Simon <doug.simon@oracle.com>
# Date 1400883832 -7200
# Node ID 11bf5b8973c993e2ba33d5a46dabdcaffdbe8b4e
# Parent  fe608a56e3f7740f662a60048b1551903f3a0960
mx: drain all subprocess output to callables before returning from mx.run

diff -r fe608a56e3f7 -r 11bf5b8973c9 mxtool/mx.py
--- a/mxtool/mx.py	Fri May 23 19:36:34 2014 +0200
+++ b/mxtool/mx.py	Sat May 24 00:23:52 2014 +0200
@@ -1514,14 +1514,19 @@
         stderr = err if not callable(err) else subprocess.PIPE
         p = subprocess.Popen(args, cwd=cwd, stdout=stdout, stderr=stderr, preexec_fn=preexec_fn, creationflags=creationflags, env=env)
         sub = _addSubprocess(p, args)
+        joiners = []
         if callable(out):
             t = Thread(target=redirect, args=(p.stdout, out))
             # Don't make the reader thread a daemon otherwise output can be droppped
             t.start()
+            joiners.append(t)
         if callable(err):
             t = Thread(target=redirect, args=(p.stderr, err))
             # Don't make the reader thread a daemon otherwise output can be droppped
             t.start()
+            joiners.append(t)
+        for t in joiners:
+            t.join()
         if timeout is None or timeout == 0:
             retcode = waitOn(p)
         else: