Fixed hanging scripts trying to parse stderr

code.py, specifically, was getting messed up by inconsequential GCC
objdump errors on Clang -g3 generated binaries.

Now stderr from child processes is just redirected to /dev/null when
-v/--verbose is not provided.

If we actually depended on redirecting stderr->stdout these scripts
would have been broken when -v/--verbose was provided anyways. Not
really sure what the original code was trying to do...

scripts/bench.py

@@ -653,7 +653,7 @@ def find_perms(runner, bench_ids=[], **args):
         print(' '.join(shlex.quote(c) for c in cmd))
     proc = sp.Popen(cmd,
         stdout=sp.PIPE,
-        stderr=sp.PIPE if not args.get('verbose') else None,
+        stderr=None if args.get('verbose') else sp.DEVNULL,
         universal_newlines=True,
         errors='replace',
         close_fds=False)
@@ -685,7 +685,7 @@ def find_perms(runner, bench_ids=[], **args):
         print(' '.join(shlex.quote(c) for c in cmd))
     proc = sp.Popen(cmd,
         stdout=sp.PIPE,
-        stderr=sp.PIPE if not args.get('verbose') else None,
+        stderr=None if args.get('verbose') else sp.DEVNULL,
         universal_newlines=True,
         errors='replace',
         close_fds=False)
@@ -732,7 +732,7 @@ def find_path(runner, id, **args):
         print(' '.join(shlex.quote(c) for c in cmd))
     proc = sp.Popen(cmd,
         stdout=sp.PIPE,
-        stderr=sp.PIPE if not args.get('verbose') else None,
+        stderr=None if args.get('verbose') else sp.DEVNULL,
         universal_newlines=True,
         errors='replace',
         close_fds=False)
@@ -763,7 +763,7 @@ def find_defines(runner, id, **args):
         print(' '.join(shlex.quote(c) for c in cmd))
     proc = sp.Popen(cmd,
         stdout=sp.PIPE,
-        stderr=sp.PIPE if not args.get('verbose') else None,
+        stderr=None if args.get('verbose') else sp.DEVNULL,
         universal_newlines=True,
         errors='replace',
         close_fds=False)

scripts/code.py

@@ -166,7 +166,7 @@ def collect(obj_paths, *,
             print(' '.join(shlex.quote(c) for c in cmd))
         proc = sp.Popen(cmd,
             stdout=sp.PIPE,
-            stderr=sp.PIPE if not args.get('verbose') else None,
+            stderr=None if args.get('verbose') else sp.DEVNULL,
             universal_newlines=True,
             errors='replace',
             close_fds=False)
@@ -197,7 +197,7 @@ def collect(obj_paths, *,
             print(' '.join(shlex.quote(c) for c in cmd))
         proc = sp.Popen(cmd,
             stdout=sp.PIPE,
-            stderr=sp.PIPE if not args.get('verbose') else None,
+            stderr=None if args.get('verbose') else sp.DEVNULL,
             universal_newlines=True,
             errors='replace',
             close_fds=False)
@@ -242,7 +242,7 @@ def collect(obj_paths, *,
             print(' '.join(shlex.quote(c) for c in cmd))
         proc = sp.Popen(cmd,
             stdout=sp.PIPE,
-            stderr=sp.PIPE if not args.get('verbose') else None,
+            stderr=None if args.get('verbose') else sp.DEVNULL,
             universal_newlines=True,
             errors='replace',
             close_fds=False)

scripts/cov.py

@@ -227,7 +227,7 @@ def collect(gcda_paths, *,
             print(' '.join(shlex.quote(c) for c in cmd))
         proc = sp.Popen(cmd,
             stdout=sp.PIPE,
-            stderr=sp.PIPE if not args.get('verbose') else None,
+            stderr=None if args.get('verbose') else sp.DEVNULL,
             universal_newlines=True,
             errors='replace',
             close_fds=False)

scripts/data.py

@@ -166,7 +166,7 @@ def collect(obj_paths, *,
             print(' '.join(shlex.quote(c) for c in cmd))
         proc = sp.Popen(cmd,
             stdout=sp.PIPE,
-            stderr=sp.PIPE if not args.get('verbose') else None,
+            stderr=None if args.get('verbose') else sp.DEVNULL,
             universal_newlines=True,
             errors='replace',
             close_fds=False)
@@ -197,7 +197,7 @@ def collect(obj_paths, *,
             print(' '.join(shlex.quote(c) for c in cmd))
         proc = sp.Popen(cmd,
             stdout=sp.PIPE,
-            stderr=sp.PIPE if not args.get('verbose') else None,
+            stderr=None if args.get('verbose') else sp.DEVNULL,
             universal_newlines=True,
             errors='replace',
             close_fds=False)
@@ -242,7 +242,7 @@ def collect(obj_paths, *,
             print(' '.join(shlex.quote(c) for c in cmd))
         proc = sp.Popen(cmd,
             stdout=sp.PIPE,
-            stderr=sp.PIPE if not args.get('verbose') else None,
+            stderr=None if args.get('verbose') else sp.DEVNULL,
             universal_newlines=True,
             errors='replace',
             close_fds=False)

scripts/perf.py

@@ -268,7 +268,7 @@ def collect_syms_and_lines(obj_path, *,
         print(' '.join(shlex.quote(c) for c in cmd))
     proc = sp.Popen(cmd,
         stdout=sp.PIPE,
-        stderr=sp.PIPE if not args.get('verbose') else None,
+        stderr=None if args.get('verbose') else sp.DEVNULL,
         universal_newlines=True,
         errors='replace',
         close_fds=False)
@@ -317,7 +317,7 @@ def collect_syms_and_lines(obj_path, *,
         print(' '.join(shlex.quote(c) for c in cmd))
     proc = sp.Popen(cmd,
         stdout=sp.PIPE,
-        stderr=sp.PIPE if not args.get('verbose') else None,
+        stderr=None if args.get('verbose') else sp.DEVNULL,
         universal_newlines=True,
         errors='replace',
         close_fds=False)
@@ -415,7 +415,7 @@ def collect_decompressed(path, *,
         print(' '.join(shlex.quote(c) for c in cmd))
     proc = sp.Popen(cmd,
         stdout=sp.PIPE,
-        stderr=sp.PIPE if not args.get('verbose') else None,
+        stderr=None if args.get('verbose') else sp.DEVNULL,
         universal_newlines=True,
         errors='replace',
         close_fds=False)

scripts/perfbd.py

@@ -174,7 +174,7 @@ def collect_syms_and_lines(obj_path, *,
         print(' '.join(shlex.quote(c) for c in cmd))
     proc = sp.Popen(cmd,
         stdout=sp.PIPE,
-        stderr=sp.PIPE if not args.get('verbose') else None,
+        stderr=None if args.get('verbose') else sp.DEVNULL,
         universal_newlines=True,
         errors='replace',
         close_fds=False)
@@ -223,7 +223,7 @@ def collect_syms_and_lines(obj_path, *,
         print(' '.join(shlex.quote(c) for c in cmd))
     proc = sp.Popen(cmd,
         stdout=sp.PIPE,
-        stderr=sp.PIPE if not args.get('verbose') else None,
+        stderr=None if args.get('verbose') else sp.DEVNULL,
         universal_newlines=True,
         errors='replace',
         close_fds=False)

scripts/structs.py

@@ -154,7 +154,7 @@ def collect(obj_paths, *,
             print(' '.join(shlex.quote(c) for c in cmd))
         proc = sp.Popen(cmd,
             stdout=sp.PIPE,
-            stderr=sp.PIPE if not args.get('verbose') else None,
+            stderr=None if args.get('verbose') else sp.DEVNULL,
             universal_newlines=True,
             errors='replace',
             close_fds=False)
@@ -200,7 +200,7 @@ def collect(obj_paths, *,
             print(' '.join(shlex.quote(c) for c in cmd))
         proc = sp.Popen(cmd,
             stdout=sp.PIPE,
-            stderr=sp.PIPE if not args.get('verbose') else None,
+            stderr=None if args.get('verbose') else sp.DEVNULL,
             universal_newlines=True,
             errors='replace',
             close_fds=False)

scripts/test.py

@@ -670,7 +670,7 @@ def find_perms(runner, test_ids=[], **args):
         print(' '.join(shlex.quote(c) for c in cmd))
     proc = sp.Popen(cmd,
         stdout=sp.PIPE,
-        stderr=sp.PIPE if not args.get('verbose') else None,
+        stderr=None if args.get('verbose') else sp.DEVNULL,
         universal_newlines=True,
         errors='replace',
         close_fds=False)
@@ -702,7 +702,7 @@ def find_perms(runner, test_ids=[], **args):
         print(' '.join(shlex.quote(c) for c in cmd))
     proc = sp.Popen(cmd,
         stdout=sp.PIPE,
-        stderr=sp.PIPE if not args.get('verbose') else None,
+        stderr=None if args.get('verbose') else sp.DEVNULL,
         universal_newlines=True,
         errors='replace',
         close_fds=False)
@@ -749,7 +749,7 @@ def find_path(runner, id, **args):
         print(' '.join(shlex.quote(c) for c in cmd))
     proc = sp.Popen(cmd,
         stdout=sp.PIPE,
-        stderr=sp.PIPE if not args.get('verbose') else None,
+        stderr=None if args.get('verbose') else sp.DEVNULL,
         universal_newlines=True,
         errors='replace',
         close_fds=False)
@@ -780,7 +780,7 @@ def find_defines(runner, id, **args):
         print(' '.join(shlex.quote(c) for c in cmd))
     proc = sp.Popen(cmd,
         stdout=sp.PIPE,
-        stderr=sp.PIPE if not args.get('verbose') else None,
+        stderr=None if args.get('verbose') else sp.DEVNULL,
         universal_newlines=True,
         errors='replace',
         close_fds=False)