[llvm] r277092 - Capture stderr when checking for gold version

[Teresa Johnson via llvm-commits]

Author: tejohnson
Date: Thu Jul 28 19:39:56 2016
New Revision: 277092

URL: http://llvm.org/viewvc/llvm-project?rev=277092&view=rev
Log:
Capture stderr when checking for gold version

On MacOS the ld version is emitted to stderr, resulting in lots of
messages in the ninja check output.

Modified:
    llvm/trunk/test/tools/gold/X86/v1.12/lit.local.cfg

Modified: llvm/trunk/test/tools/gold/X86/v1.12/lit.local.cfg
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/tools/gold/X86/v1.12/lit.local.cfg?rev=277092&r1=277091&r2=277092&view=diff
==============================================================================
--- llvm/trunk/test/tools/gold/X86/v1.12/lit.local.cfg (original)
+++ llvm/trunk/test/tools/gold/X86/v1.12/lit.local.cfg Thu Jul 28 19:39:56 2016
@@ -6,9 +6,11 @@ def is_gold_v1_12_linker_available():
   if not config.gold_executable:
     return False
   try:
-    ld_cmd = subprocess.Popen([config.gold_executable, '-v'], stdout = subprocess.PIPE)
-    ld_out = ld_cmd.stdout.read().decode()
-    ld_cmd.wait()
+    ld_cmd = subprocess.Popen([config.gold_executable, '-v'],
+                              stdout = subprocess.PIPE,
+                              stderr = subprocess.PIPE)
+    ld_out, _ = ld_cmd.communicate()
+    ld_out = ld_out.decode()
   except:
     return False