[llvm-commits] [zorg] r153991 - in /zorg/trunk/lnt/lnt: testing/util/misc.py tests/compile.py

[Daniel Dunbar]

Author: ddunbar
Date: Tue Apr  3 21:26:12 2012
New Revision: 153991

URL: http://llvm.org/viewvc/llvm-project?rev=153991&view=rev
Log:
[LNT] lnt.tests.compile: Stop closing sys.stderr() at the end of the run.

Modified:
    zorg/trunk/lnt/lnt/testing/util/misc.py
    zorg/trunk/lnt/lnt/tests/compile.py

Modified: zorg/trunk/lnt/lnt/testing/util/misc.py
URL: http://llvm.org/viewvc/llvm-project/zorg/trunk/lnt/lnt/testing/util/misc.py?rev=153991&r1=153990&r2=153991&view=diff
==============================================================================
--- zorg/trunk/lnt/lnt/testing/util/misc.py (original)
+++ zorg/trunk/lnt/lnt/testing/util/misc.py Tue Apr  3 21:26:12 2012
@@ -3,17 +3,20 @@
 class TeeStream(object):
     """File-like object for writing to multiple output streams."""
 
-    def __init__(self, a, b):
+    def __init__(self, a, b, noclose_b = False):
         self.a = a
         self.b = b
+        self.noclose_b = noclose_b
 
     def __del__(self):
         del self.a
-        del self.b
+        if not self.noclose_b:
+            del self.b
 
     def close(self):
         self.a.close()
-        self.b.close()
+        if not self.noclose_b:
+            self.b.close()
 
     def write(self, value):
         self.a.write(value)

Modified: zorg/trunk/lnt/lnt/tests/compile.py
URL: http://llvm.org/viewvc/llvm-project/zorg/trunk/lnt/lnt/tests/compile.py?rev=153991&r1=153990&r2=153991&view=diff
==============================================================================
--- zorg/trunk/lnt/lnt/tests/compile.py (original)
+++ zorg/trunk/lnt/lnt/tests/compile.py Tue Apr  3 21:26:12 2012
@@ -795,7 +795,7 @@
         test_log = open(test_log_path, 'w')
 
         # Tee the output to stderr as well.
-        test_log = TeeStream(test_log, sys.stderr)
+        test_log = TeeStream(test_log, sys.stderr, noclose_b=True)
 
         # Execute the run.
         run_info.update(variables)