[llvm-commits] [zorg] r103076 - /zorg/trunk/lnt/lnt/tests/nt.py

[Daniel Dunbar]

Author: ddunbar
Date: Wed May  5 00:37:18 2010
New Revision: 103076

URL: http://llvm.org/viewvc/llvm-project?rev=103076&view=rev
Log:
LNT/nt: Force environ when running nightly test Makefile, somehow
MACOSX_DEPLOYMENT_TARGET is creeping in on OS X without this.

Modified:
    zorg/trunk/lnt/lnt/tests/nt.py

Modified: zorg/trunk/lnt/lnt/tests/nt.py
URL: http://llvm.org/viewvc/llvm-project/zorg/trunk/lnt/lnt/tests/nt.py?rev=103076&r1=103075&r2=103076&view=diff
==============================================================================
--- zorg/trunk/lnt/lnt/tests/nt.py (original)
+++ zorg/trunk/lnt/lnt/tests/nt.py Wed May  5 00:37:18 2010
@@ -179,9 +179,13 @@
                                                     for a in args))
     test_log.flush()
 
+    # FIXME: We shouldn't need to set env=os.environ here, but if we don't
+    # somehow MACOSX_DEPLOYMENT_TARGET gets injected into the environment on OS
+    # X (which changes the driver behavior and causes generally weirdness).
     print >>sys.stderr, '%s: testing...' % timestamp()
     p = subprocess.Popen(args=args, stdin=None, stdout=test_log,
-                         stderr=subprocess.STDOUT, cwd=basedir)
+                         stderr=subprocess.STDOUT, cwd=basedir,
+                         env=os.environ)
     res = p.wait()
     test_log.close()