[cfe-commits] r158954 - in /cfe/trunk: test/Misc/warning-flags-enabled.c test/Misc/warning-flags.c tools/diagtool/diagtool_main.cpp

[Jordan Rose]

Author: jrose
Date: Thu Jun 21 19:33:20 2012
New Revision: 158954

URL: http://llvm.org/viewvc/llvm-project?rev=158954&view=rev
Log:
[diagtool] Write to llvm::outs() by default instead of llvm::errs()

Modified:
    cfe/trunk/test/Misc/warning-flags-enabled.c
    cfe/trunk/test/Misc/warning-flags.c
    cfe/trunk/tools/diagtool/diagtool_main.cpp

Modified: cfe/trunk/test/Misc/warning-flags-enabled.c
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Misc/warning-flags-enabled.c?rev=158954&r1=158953&r2=158954&view=diff
==============================================================================
--- cfe/trunk/test/Misc/warning-flags-enabled.c (original)
+++ cfe/trunk/test/Misc/warning-flags-enabled.c Thu Jun 21 19:33:20 2012
@@ -1,4 +1,4 @@
-// RUN: diagtool show-enabled %s 2>&1 | FileCheck %s
+// RUN: diagtool show-enabled %s | FileCheck %s
 //
 // This shows warnings which are on by default.
 // We just check a few to make sure it's doing something sensible.
@@ -8,18 +8,18 @@
 // CHECK: warn_unterminated_string
 
 
-// RUN: diagtool show-enabled -Wno-everything %s 2>&1 | count 0
+// RUN: diagtool show-enabled -Wno-everything %s | count 0
 
 
-// RUN: diagtool show-enabled -Wno-everything -Wobjc-root-class %s 2>&1 | FileCheck -check-prefix CHECK-WARN %s
-// RUN: diagtool show-enabled -Wno-everything -Werror=objc-root-class %s 2>&1 | FileCheck -check-prefix CHECK-ERROR %s
-// RUN: diagtool show-enabled -Wno-everything -Wfatal-errors=objc-root-class %s 2>&1 | FileCheck -check-prefix CHECK-FATAL %s
+// RUN: diagtool show-enabled -Wno-everything -Wobjc-root-class %s | FileCheck -check-prefix CHECK-WARN %s
+// RUN: diagtool show-enabled -Wno-everything -Werror=objc-root-class %s | FileCheck -check-prefix CHECK-ERROR %s
+// RUN: diagtool show-enabled -Wno-everything -Wfatal-errors=objc-root-class %s | FileCheck -check-prefix CHECK-FATAL %s
 //
 // CHECK-WARN:  W  warn_objc_root_class_missing [-Wobjc-root-class]
 // CHECK-ERROR: E  warn_objc_root_class_missing [-Wobjc-root-class]
 // CHECK-FATAL: F  warn_objc_root_class_missing [-Wobjc-root-class]
 
-// RUN: diagtool show-enabled --no-levels -Wno-everything -Wobjc-root-class %s 2>&1 | FileCheck -check-prefix CHECK-NO-LEVELS %s
+// RUN: diagtool show-enabled --no-levels -Wno-everything -Wobjc-root-class %s | FileCheck -check-prefix CHECK-NO-LEVELS %s
 //
 // CHECK-NO-LEVELS-NOT: W
 // CHECK-NO-LEVELS-NOT: E

Modified: cfe/trunk/test/Misc/warning-flags.c
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Misc/warning-flags.c?rev=158954&r1=158953&r2=158954&view=diff
==============================================================================
--- cfe/trunk/test/Misc/warning-flags.c (original)
+++ cfe/trunk/test/Misc/warning-flags.c Thu Jun 21 19:33:20 2012
@@ -1,4 +1,4 @@
-RUN: diagtool list-warnings 2>&1 | FileCheck %s
+RUN: diagtool list-warnings | FileCheck %s
 
 This test serves two purposes:
 

Modified: cfe/trunk/tools/diagtool/diagtool_main.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/tools/diagtool/diagtool_main.cpp?rev=158954&r1=158953&r2=158954&view=diff
==============================================================================
--- cfe/trunk/tools/diagtool/diagtool_main.cpp (original)
+++ cfe/trunk/tools/diagtool/diagtool_main.cpp Thu Jun 21 19:33:20 2012
@@ -18,7 +18,7 @@
 int main(int argc, char *argv[]) {
   if (argc > 1)
     if (DiagTool *tool = diagTools->getTool(argv[1]))
-      return tool->run(argc - 2, &argv[2], llvm::errs());
+      return tool->run(argc - 2, &argv[2], llvm::outs());
 
   llvm::errs() << "usage: diagtool <command> [<args>]\n\n";
   diagTools->printCommands(llvm::errs());