Index: llvm/trunk/test/tools/llvm-profdata/invalid-profdata.test
===================================================================
--- llvm/trunk/test/tools/llvm-profdata/invalid-profdata.test
+++ llvm/trunk/test/tools/llvm-profdata/invalid-profdata.test
@@ -20,7 +20,7 @@
 RUN: echo "1"                                            >> %t.input
 RUN: echo ":10"                                          >> %t.input
 
-RUN: not llvm-profdata merge %t.input -text -o /dev/null 2>&1  | FileCheck %s --check-prefix=BROKEN
+RUN: not llvm-profdata merge %t.input -text -output=/dev/null 2>&1  | FileCheck %s --check-prefix=BROKEN
 BROKEN: Malformed instrumentation profile data
 
 RUN: echo ":ir"                     > %t.input
Index: llvm/trunk/utils/lit/lit/TestRunner.py
===================================================================
--- llvm/trunk/utils/lit/lit/TestRunner.py
+++ llvm/trunk/utils/lit/lit/TestRunner.py
@@ -36,6 +36,7 @@
 
 # Use temporary files to replace /dev/null on Windows.
 kAvoidDevNull = kIsWindows
+kDevNull = "/dev/null"
 
 class ShellEnvironment(object):
 
@@ -626,7 +627,7 @@
            raise InternalShellError(cmd, "Unsupported: glob in "
                                     "redirect expanded to multiple files")
         name = name[0]
-        if kAvoidDevNull and name == '/dev/null':
+        if kAvoidDevNull and name == kDevNull:
             fd = tempfile.TemporaryFile(mode=mode)
         elif kIsWindows and name == '/dev/tty':
             # Simulate /dev/tty on Windows.
@@ -797,11 +798,11 @@
         # Replace uses of /dev/null with temporary files.
         if kAvoidDevNull:
             for i,arg in enumerate(args):
-                if arg == "/dev/null":
+                if isinstance(arg, basestring) and kDevNull in arg:
                     f = tempfile.NamedTemporaryFile(delete=False)
                     f.close()
                     named_temp_files.append(f.name)
-                    args[i] = f.name
+                    args[i] = arg.replace(kDevNull, f.name)
 
         # Expand all glob expressions
         args = expand_glob_expressions(args, cmd_shenv.cwd)
Index: llvm/trunk/utils/lit/tests/Inputs/shtest-shell/check_args.py
===================================================================
--- llvm/trunk/utils/lit/tests/Inputs/shtest-shell/check_args.py
+++ llvm/trunk/utils/lit/tests/Inputs/shtest-shell/check_args.py
@@ -0,0 +1,14 @@
+#!/usr/bin/env python
+
+import argparse
+import platform
+
+parser = argparse.ArgumentParser()
+parser.add_argument("--my_arg", "-a")
+
+args = parser.parse_args()
+
+answer = (platform.system() == "Windows" and
+          args.my_arg == "/dev/null" and "ERROR") or "OK"
+
+print(answer)
Index: llvm/trunk/utils/lit/tests/Inputs/shtest-shell/dev-null.txt
===================================================================
--- llvm/trunk/utils/lit/tests/Inputs/shtest-shell/dev-null.txt
+++ llvm/trunk/utils/lit/tests/Inputs/shtest-shell/dev-null.txt
@@ -0,0 +1,14 @@
+# Check handling of /dev/null in command line options
+# On windows, it should be redirected to a temp file.
+#
+# RUN: "%{python}" %S/check_args.py --my_arg /dev/null | FileCheck %s --check-prefix=CHECK1
+# CHECK1: OK
+
+# RUN: "%{python}" %S/check_args.py --my_arg=/dev/null | FileCheck %s --check-prefix=CHECK2
+# CHECK2: OK
+
+# RUN: "%{python}" %S/check_args.py -a /dev/null | FileCheck %s --check-prefix=CHECK3
+# CHECK3: OK
+
+# RUN: "%{python}" %S/check_args.py -a=/dev/null | FileCheck %s --check-prefix=CHECK4
+# CHECK4: OK