From 9011eb81cf8d93b863e041a278be4dcacf578241 Mon Sep 17 00:00:00 2001
From: Timur Iskhodzhanov <timurrrr@google.com>
Date: Mon, 26 May 2014 11:54:20 +0000
Subject: [PATCH] [ASan/Win tests] Remove the extra 'cat' in front of FileCheck
 now that it's clear we should use GnuWin32 rather than Cygwin on the PATH on
 Windows (see PR19744)

llvm-svn: 209622
---
 compiler-rt/test/asan/TestCases/Windows/bitfield_uaf.cc        | 3 +--
 compiler-rt/test/asan/TestCases/Windows/calloc_left_oob.cc     | 3 +--
 compiler-rt/test/asan/TestCases/Windows/calloc_right_oob.cc    | 3 +--
 compiler-rt/test/asan/TestCases/Windows/calloc_uaf.cc          | 3 +--
 .../test/asan/TestCases/Windows/dll_intercept_memcpy.cc        | 3 +--
 .../test/asan/TestCases/Windows/dll_intercept_strlen.cc        | 3 +--
 compiler-rt/test/asan/TestCases/Windows/dll_malloc_left_oob.cc | 3 +--
 compiler-rt/test/asan/TestCases/Windows/dll_malloc_uaf.cc      | 3 +--
 compiler-rt/test/asan/TestCases/Windows/dll_noreturn.cc        | 3 +--
 .../asan/TestCases/Windows/dll_operator_array_new_left_oob.cc  | 3 +--
 .../Windows/dll_operator_array_new_with_dtor_left_oob.cc       | 3 +--
 compiler-rt/test/asan/TestCases/Windows/dll_poison_unpoison.cc | 3 +--
 .../test/asan/TestCases/Windows/dll_stack_use_after_return.cc  | 3 +--
 .../asan/TestCases/Windows/dll_thread_stack_array_left_oob.cc  | 3 +--
 compiler-rt/test/asan/TestCases/Windows/double_free.cc         | 3 +--
 .../test/asan/TestCases/Windows/double_operator_delete.cc      | 3 +--
 .../test/asan/TestCases/Windows/global_const_string_oob.cc     | 3 +--
 compiler-rt/test/asan/TestCases/Windows/intercept_memcpy.cc    | 3 +--
 compiler-rt/test/asan/TestCases/Windows/intercept_strdup.cc    | 3 +--
 compiler-rt/test/asan/TestCases/Windows/intercept_strlen.cc    | 3 +--
 compiler-rt/test/asan/TestCases/Windows/malloc_left_oob.cc     | 3 +--
 compiler-rt/test/asan/TestCases/Windows/malloc_right_oob.cc    | 3 +--
 compiler-rt/test/asan/TestCases/Windows/malloc_uaf.cc          | 3 +--
 .../test/asan/TestCases/Windows/operator_array_new_left_oob.cc | 3 +--
 .../asan/TestCases/Windows/operator_array_new_right_oob.cc     | 3 +--
 .../test/asan/TestCases/Windows/operator_array_new_uaf.cc      | 3 +--
 .../TestCases/Windows/operator_array_new_with_dtor_left_oob.cc | 3 +--
 .../asan/TestCases/Windows/operator_delete_wrong_argument.cc   | 3 +--
 .../test/asan/TestCases/Windows/operator_new_left_oob.cc       | 3 +--
 .../test/asan/TestCases/Windows/operator_new_right_oob.cc      | 3 +--
 compiler-rt/test/asan/TestCases/Windows/operator_new_uaf.cc    | 3 +--
 compiler-rt/test/asan/TestCases/Windows/realloc_left_oob.cc    | 3 +--
 compiler-rt/test/asan/TestCases/Windows/realloc_right_oob.cc   | 3 +--
 compiler-rt/test/asan/TestCases/Windows/realloc_uaf.cc         | 3 +--
 .../test/asan/TestCases/Windows/stack_array_left_oob.cc        | 3 +--
 .../test/asan/TestCases/Windows/stack_array_right_oob.cc       | 3 +--
 .../test/asan/TestCases/Windows/stack_use_after_return.cc      | 3 +--
 .../test/asan/TestCases/Windows/thread_stack_array_left_oob.cc | 3 +--
 .../asan/TestCases/Windows/thread_stack_array_right_oob.cc     | 3 +--
 compiler-rt/test/asan/TestCases/Windows/use_after_realloc.cc   | 3 +--
 .../test/asan/TestCases/Windows/wrong_downcast_on_heap.cc      | 3 +--
 .../test/asan/TestCases/Windows/wrong_downcast_on_stack.cc     | 3 +--
 42 files changed, 42 insertions(+), 84 deletions(-)

diff --git a/compiler-rt/test/asan/TestCases/Windows/bitfield_uaf.cc b/compiler-rt/test/asan/TestCases/Windows/bitfield_uaf.cc
index 2e63956586d5..63f3941e8a94 100644
--- a/compiler-rt/test/asan/TestCases/Windows/bitfield_uaf.cc
+++ b/compiler-rt/test/asan/TestCases/Windows/bitfield_uaf.cc
@@ -1,6 +1,5 @@
 // RUN: %clangxx_asan -O0 %s -Fe%t
-// FIXME: 'cat' is needed due to PR19744.
-// RUN: not %run %t 2>&1 | cat | FileCheck %s
+// RUN: not %run %t 2>&1 | FileCheck %s
 
 #include <windows.h>
 
diff --git a/compiler-rt/test/asan/TestCases/Windows/calloc_left_oob.cc b/compiler-rt/test/asan/TestCases/Windows/calloc_left_oob.cc
index d005e08694e2..71399a75a1a9 100644
--- a/compiler-rt/test/asan/TestCases/Windows/calloc_left_oob.cc
+++ b/compiler-rt/test/asan/TestCases/Windows/calloc_left_oob.cc
@@ -1,6 +1,5 @@
 // RUN: %clangxx_asan -O0 %s -Fe%t
-// FIXME: 'cat' is needed due to PR19744.
-// RUN: not %run %t 2>&1 | cat | FileCheck %s
+// RUN: not %run %t 2>&1 | FileCheck %s
 
 #include <malloc.h>
 
diff --git a/compiler-rt/test/asan/TestCases/Windows/calloc_right_oob.cc b/compiler-rt/test/asan/TestCases/Windows/calloc_right_oob.cc
index f013d8b767b5..fcf313878a63 100644
--- a/compiler-rt/test/asan/TestCases/Windows/calloc_right_oob.cc
+++ b/compiler-rt/test/asan/TestCases/Windows/calloc_right_oob.cc
@@ -1,6 +1,5 @@
 // RUN: %clangxx_asan -O0 %s -Fe%t
-// FIXME: 'cat' is needed due to PR19744.
-// RUN: not %run %t 2>&1 | cat | FileCheck %s
+// RUN: not %run %t 2>&1 | FileCheck %s
 
 #include <malloc.h>
 
diff --git a/compiler-rt/test/asan/TestCases/Windows/calloc_uaf.cc b/compiler-rt/test/asan/TestCases/Windows/calloc_uaf.cc
index 824d2b8b4b4d..5a1d9366f353 100644
--- a/compiler-rt/test/asan/TestCases/Windows/calloc_uaf.cc
+++ b/compiler-rt/test/asan/TestCases/Windows/calloc_uaf.cc
@@ -1,6 +1,5 @@
 // RUN: %clangxx_asan -O0 %s -Fe%t
-// FIXME: 'cat' is needed due to PR19744.
-// RUN: not %run %t 2>&1 | cat | FileCheck %s
+// RUN: not %run %t 2>&1 | FileCheck %s
 
 #include <malloc.h>
 
diff --git a/compiler-rt/test/asan/TestCases/Windows/dll_intercept_memcpy.cc b/compiler-rt/test/asan/TestCases/Windows/dll_intercept_memcpy.cc
index ffa3bf9ad9ad..8a69e7d6a955 100644
--- a/compiler-rt/test/asan/TestCases/Windows/dll_intercept_memcpy.cc
+++ b/compiler-rt/test/asan/TestCases/Windows/dll_intercept_memcpy.cc
@@ -1,7 +1,6 @@
 // RUN: %clangxx_asan -O0 %p/dll_host.cc -Fe%t
 // RUN: %clangxx_asan -LD -O0 %s -Fe%t.dll
-// FIXME: 'cat' is needed due to PR19744.
-// RUN: not %run %t %t.dll 2>&1 | cat | FileCheck %s
+// RUN: not %run %t %t.dll 2>&1 | FileCheck %s
 
 #include <stdio.h>
 #include <string.h>
diff --git a/compiler-rt/test/asan/TestCases/Windows/dll_intercept_strlen.cc b/compiler-rt/test/asan/TestCases/Windows/dll_intercept_strlen.cc
index 684c82c85ac0..caac42647e10 100644
--- a/compiler-rt/test/asan/TestCases/Windows/dll_intercept_strlen.cc
+++ b/compiler-rt/test/asan/TestCases/Windows/dll_intercept_strlen.cc
@@ -1,7 +1,6 @@
 // RUN: %clangxx_asan -O0 %p/dll_host.cc -Fe%t
 // RUN: %clangxx_asan -LD -O0 %s -Fe%t.dll
-// FIXME: 'cat' is needed due to PR19744.
-// RUN: not %run %t %t.dll 2>&1 | cat | FileCheck %s
+// RUN: not %run %t %t.dll 2>&1 | FileCheck %s
 
 #include <stdio.h>
 #include <string.h>
diff --git a/compiler-rt/test/asan/TestCases/Windows/dll_malloc_left_oob.cc b/compiler-rt/test/asan/TestCases/Windows/dll_malloc_left_oob.cc
index cc96dd4f04c9..8064b83cbcec 100644
--- a/compiler-rt/test/asan/TestCases/Windows/dll_malloc_left_oob.cc
+++ b/compiler-rt/test/asan/TestCases/Windows/dll_malloc_left_oob.cc
@@ -1,7 +1,6 @@
 // RUN: %clangxx_asan -O0 %p/dll_host.cc -Fe%t
 // RUN: %clangxx_asan -LD -O0 %s -Fe%t.dll
-// FIXME: 'cat' is needed due to PR19744.
-// RUN: not %run %t %t.dll 2>&1 | cat | FileCheck %s
+// RUN: not %run %t %t.dll 2>&1 | FileCheck %s
 
 #include <malloc.h>
 extern "C" __declspec(dllexport)
diff --git a/compiler-rt/test/asan/TestCases/Windows/dll_malloc_uaf.cc b/compiler-rt/test/asan/TestCases/Windows/dll_malloc_uaf.cc
index 7a37b44dc4a0..5842999fdf32 100644
--- a/compiler-rt/test/asan/TestCases/Windows/dll_malloc_uaf.cc
+++ b/compiler-rt/test/asan/TestCases/Windows/dll_malloc_uaf.cc
@@ -1,7 +1,6 @@
 // RUN: %clangxx_asan -O0 %p/dll_host.cc -Fe%t
 // RUN: %clangxx_asan -LD -O0 %s -Fe%t.dll
-// FIXME: 'cat' is needed due to PR19744.
-// RUN: not %run %t %t.dll 2>&1 | cat | FileCheck %s
+// RUN: not %run %t %t.dll 2>&1 | FileCheck %s
 
 #include <malloc.h>
 
diff --git a/compiler-rt/test/asan/TestCases/Windows/dll_noreturn.cc b/compiler-rt/test/asan/TestCases/Windows/dll_noreturn.cc
index 90e0c11ba74d..4b5bf33aae8c 100644
--- a/compiler-rt/test/asan/TestCases/Windows/dll_noreturn.cc
+++ b/compiler-rt/test/asan/TestCases/Windows/dll_noreturn.cc
@@ -1,7 +1,6 @@
 // RUN: %clangxx_asan -O0 %p/dll_host.cc -Fe%t
 // RUN: %clangxx_asan -LD -O0 %s -Fe%t.dll
-// FIXME: 'cat' is needed due to PR19744.
-// RUN: not %run %t %t.dll 2>&1 | cat | FileCheck %s
+// RUN: not %run %t %t.dll 2>&1 | FileCheck %s
 
 #include <process.h>
 
diff --git a/compiler-rt/test/asan/TestCases/Windows/dll_operator_array_new_left_oob.cc b/compiler-rt/test/asan/TestCases/Windows/dll_operator_array_new_left_oob.cc
index 0c9832256350..509e0afe015e 100644
--- a/compiler-rt/test/asan/TestCases/Windows/dll_operator_array_new_left_oob.cc
+++ b/compiler-rt/test/asan/TestCases/Windows/dll_operator_array_new_left_oob.cc
@@ -1,7 +1,6 @@
 // RUN: %clangxx_asan -O0 %p/dll_host.cc -Fe%t
 // RUN: %clangxx_asan -LD -O0 %s -Fe%t.dll
-// FIXME: 'cat' is needed due to PR19744.
-// RUN: not %run %t %t.dll 2>&1 | cat | FileCheck %s
+// RUN: not %run %t %t.dll 2>&1 | FileCheck %s
 
 extern "C" __declspec(dllexport)
 int test_function() {
diff --git a/compiler-rt/test/asan/TestCases/Windows/dll_operator_array_new_with_dtor_left_oob.cc b/compiler-rt/test/asan/TestCases/Windows/dll_operator_array_new_with_dtor_left_oob.cc
index c014b4b9000c..09302c3deb85 100644
--- a/compiler-rt/test/asan/TestCases/Windows/dll_operator_array_new_with_dtor_left_oob.cc
+++ b/compiler-rt/test/asan/TestCases/Windows/dll_operator_array_new_with_dtor_left_oob.cc
@@ -1,7 +1,6 @@
 // RUN: %clangxx_asan -O0 %p/dll_host.cc -Fe%t
 // RUN: %clangxx_asan -LD -O0 %s -Fe%t.dll
-// FIXME: 'cat' is needed due to PR19744.
-// RUN: not %run %t %t.dll 2>&1 | cat | FileCheck %s
+// RUN: not %run %t %t.dll 2>&1 | FileCheck %s
 
 struct C {
   int x;
diff --git a/compiler-rt/test/asan/TestCases/Windows/dll_poison_unpoison.cc b/compiler-rt/test/asan/TestCases/Windows/dll_poison_unpoison.cc
index 6051a1f298fc..24f98dd39e46 100644
--- a/compiler-rt/test/asan/TestCases/Windows/dll_poison_unpoison.cc
+++ b/compiler-rt/test/asan/TestCases/Windows/dll_poison_unpoison.cc
@@ -1,7 +1,6 @@
 // RUN: %clangxx_asan -O0 %p/dll_host.cc -Fe%t
 // RUN: %clangxx_asan -LD -O0 %s -Fe%t.dll
-// FIXME: 'cat' is needed due to PR19744.
-// RUN: not %run %t %t.dll 2>&1 | cat | FileCheck %s
+// RUN: not %run %t %t.dll 2>&1 | FileCheck %s
 
 #include <sanitizer/asan_interface.h>
 
diff --git a/compiler-rt/test/asan/TestCases/Windows/dll_stack_use_after_return.cc b/compiler-rt/test/asan/TestCases/Windows/dll_stack_use_after_return.cc
index 322aa53168e6..22d997055697 100644
--- a/compiler-rt/test/asan/TestCases/Windows/dll_stack_use_after_return.cc
+++ b/compiler-rt/test/asan/TestCases/Windows/dll_stack_use_after_return.cc
@@ -1,7 +1,6 @@
 // RUN: %clangxx_asan -O0 %p/dll_host.cc -Fe%t
 // RUN: %clangxx_asan -LD -O0 %s -Fe%t.dll
-// FIXME: 'cat' is needed due to PR19744.
-// RUN: env ASAN_OPTIONS=detect_stack_use_after_return=1 not %run %t %t.dll 2>&1 | cat | FileCheck %s
+// RUN: env ASAN_OPTIONS=detect_stack_use_after_return=1 not %run %t %t.dll 2>&1 | FileCheck %s
 
 #include <malloc.h>
 
diff --git a/compiler-rt/test/asan/TestCases/Windows/dll_thread_stack_array_left_oob.cc b/compiler-rt/test/asan/TestCases/Windows/dll_thread_stack_array_left_oob.cc
index e777e1bd7c0e..a84eeb9fa2fc 100644
--- a/compiler-rt/test/asan/TestCases/Windows/dll_thread_stack_array_left_oob.cc
+++ b/compiler-rt/test/asan/TestCases/Windows/dll_thread_stack_array_left_oob.cc
@@ -1,7 +1,6 @@
 // RUN: %clangxx_asan -O0 %p/dll_host.cc -Fe%t
 // RUN: %clangxx_asan -LD -O0 %s -Fe%t.dll
-// FIXME: 'cat' is needed due to PR19744.
-// RUN: not %run %t %t.dll 2>&1 | cat | FileCheck %s
+// RUN: not %run %t %t.dll 2>&1 | FileCheck %s
 
 #include <windows.h>
 #include <malloc.h>
diff --git a/compiler-rt/test/asan/TestCases/Windows/double_free.cc b/compiler-rt/test/asan/TestCases/Windows/double_free.cc
index de0c0b5c7bc8..6745c59ae653 100644
--- a/compiler-rt/test/asan/TestCases/Windows/double_free.cc
+++ b/compiler-rt/test/asan/TestCases/Windows/double_free.cc
@@ -1,6 +1,5 @@
 // RUN: %clangxx_asan -O0 %s -Fe%t
-// FIXME: 'cat' is needed due to PR19744.
-// RUN: not %run %t 2>&1 | cat | FileCheck %s
+// RUN: not %run %t 2>&1 | FileCheck %s
 
 #include <malloc.h>
 
diff --git a/compiler-rt/test/asan/TestCases/Windows/double_operator_delete.cc b/compiler-rt/test/asan/TestCases/Windows/double_operator_delete.cc
index 795af4ac88a2..1cd7080d8d21 100644
--- a/compiler-rt/test/asan/TestCases/Windows/double_operator_delete.cc
+++ b/compiler-rt/test/asan/TestCases/Windows/double_operator_delete.cc
@@ -1,6 +1,5 @@
 // RUN: %clangxx_asan -O0 %s -Fe%t
-// FIXME: 'cat' is needed due to PR19744.
-// RUN: not %run %t 2>&1 | cat | FileCheck %s
+// RUN: not %run %t 2>&1 | FileCheck %s
 
 #include <malloc.h>
 
diff --git a/compiler-rt/test/asan/TestCases/Windows/global_const_string_oob.cc b/compiler-rt/test/asan/TestCases/Windows/global_const_string_oob.cc
index ade39fea5d5e..b54a2bb5aa43 100644
--- a/compiler-rt/test/asan/TestCases/Windows/global_const_string_oob.cc
+++ b/compiler-rt/test/asan/TestCases/Windows/global_const_string_oob.cc
@@ -1,6 +1,5 @@
 // RUN: %clangxx_asan -O0 %s -Fe%t
-// FIXME: 'cat' is needed due to PR19744.
-// RUN: not %run %t 2>&1 | cat | FileCheck %s
+// RUN: not %run %t 2>&1 | FileCheck %s
 
 #include <windows.h>
 #include <stdio.h>
diff --git a/compiler-rt/test/asan/TestCases/Windows/intercept_memcpy.cc b/compiler-rt/test/asan/TestCases/Windows/intercept_memcpy.cc
index 64f38da6b632..73ce951b3dd4 100644
--- a/compiler-rt/test/asan/TestCases/Windows/intercept_memcpy.cc
+++ b/compiler-rt/test/asan/TestCases/Windows/intercept_memcpy.cc
@@ -1,6 +1,5 @@
 // RUN: %clangxx_asan -O0 %s -Fe%t
-// FIXME: 'cat' is needed due to PR19744.
-// RUN: not %run %t 2>&1 | cat | FileCheck %s
+// RUN: not %run %t 2>&1 | FileCheck %s
 
 #include <stdio.h>
 #include <string.h>
diff --git a/compiler-rt/test/asan/TestCases/Windows/intercept_strdup.cc b/compiler-rt/test/asan/TestCases/Windows/intercept_strdup.cc
index 1e1a26d6a770..1bc235f5a335 100644
--- a/compiler-rt/test/asan/TestCases/Windows/intercept_strdup.cc
+++ b/compiler-rt/test/asan/TestCases/Windows/intercept_strdup.cc
@@ -1,6 +1,5 @@
 // RUN: %clangxx_asan -O0 %s -Fe%t
-// FIXME: 'cat' is needed due to PR19744.
-// RUN: not %run %t 2>&1 | cat | FileCheck %s
+// RUN: not %run %t 2>&1 | FileCheck %s
 
 #include <stdio.h>
 #include <string.h>
diff --git a/compiler-rt/test/asan/TestCases/Windows/intercept_strlen.cc b/compiler-rt/test/asan/TestCases/Windows/intercept_strlen.cc
index f32f4033515d..62a5be8b3c1c 100644
--- a/compiler-rt/test/asan/TestCases/Windows/intercept_strlen.cc
+++ b/compiler-rt/test/asan/TestCases/Windows/intercept_strlen.cc
@@ -1,6 +1,5 @@
 // RUN: %clangxx_asan -O0 %s -Fe%t
-// FIXME: 'cat' is needed due to PR19744.
-// RUN: not %run %t 2>&1 | cat | FileCheck %s
+// RUN: not %run %t 2>&1 | FileCheck %s
 
 #include <stdio.h>
 #include <string.h>
diff --git a/compiler-rt/test/asan/TestCases/Windows/malloc_left_oob.cc b/compiler-rt/test/asan/TestCases/Windows/malloc_left_oob.cc
index bf83ad4181d1..2f6516e7332f 100644
--- a/compiler-rt/test/asan/TestCases/Windows/malloc_left_oob.cc
+++ b/compiler-rt/test/asan/TestCases/Windows/malloc_left_oob.cc
@@ -1,6 +1,5 @@
 // RUN: %clangxx_asan -O0 %s -Fe%t
-// FIXME: 'cat' is needed due to PR19744.
-// RUN: not %run %t 2>&1 | cat | FileCheck %s
+// RUN: not %run %t 2>&1 | FileCheck %s
 
 #include <malloc.h>
 
diff --git a/compiler-rt/test/asan/TestCases/Windows/malloc_right_oob.cc b/compiler-rt/test/asan/TestCases/Windows/malloc_right_oob.cc
index 0d6b611f625a..ba1bf93ed0a8 100644
--- a/compiler-rt/test/asan/TestCases/Windows/malloc_right_oob.cc
+++ b/compiler-rt/test/asan/TestCases/Windows/malloc_right_oob.cc
@@ -1,6 +1,5 @@
 // RUN: %clangxx_asan -O0 %s -Fe%t
-// FIXME: 'cat' is needed due to PR19744.
-// RUN: not %run %t 2>&1 | cat | FileCheck %s
+// RUN: not %run %t 2>&1 | FileCheck %s
 
 #include <malloc.h>
 
diff --git a/compiler-rt/test/asan/TestCases/Windows/malloc_uaf.cc b/compiler-rt/test/asan/TestCases/Windows/malloc_uaf.cc
index aac64bae8d78..3f873ccb6280 100644
--- a/compiler-rt/test/asan/TestCases/Windows/malloc_uaf.cc
+++ b/compiler-rt/test/asan/TestCases/Windows/malloc_uaf.cc
@@ -1,6 +1,5 @@
 // RUN: %clangxx_asan -O0 %s -Fe%t
-// FIXME: 'cat' is needed due to PR19744.
-// RUN: not %run %t 2>&1 | cat | FileCheck %s
+// RUN: not %run %t 2>&1 | FileCheck %s
 
 #include <malloc.h>
 
diff --git a/compiler-rt/test/asan/TestCases/Windows/operator_array_new_left_oob.cc b/compiler-rt/test/asan/TestCases/Windows/operator_array_new_left_oob.cc
index 33b63776f48e..082cf4c45ea6 100644
--- a/compiler-rt/test/asan/TestCases/Windows/operator_array_new_left_oob.cc
+++ b/compiler-rt/test/asan/TestCases/Windows/operator_array_new_left_oob.cc
@@ -1,6 +1,5 @@
 // RUN: %clangxx_asan -O0 %s -Fe%t
-// FIXME: 'cat' is needed due to PR19744.
-// RUN: not %run %t 2>&1 | cat | FileCheck %s
+// RUN: not %run %t 2>&1 | FileCheck %s
 
 int main() {
   char *buffer = new char[42];
diff --git a/compiler-rt/test/asan/TestCases/Windows/operator_array_new_right_oob.cc b/compiler-rt/test/asan/TestCases/Windows/operator_array_new_right_oob.cc
index 8af6da1425fa..1465fa06d51a 100644
--- a/compiler-rt/test/asan/TestCases/Windows/operator_array_new_right_oob.cc
+++ b/compiler-rt/test/asan/TestCases/Windows/operator_array_new_right_oob.cc
@@ -1,6 +1,5 @@
 // RUN: %clangxx_asan -O0 %s -Fe%t
-// FIXME: 'cat' is needed due to PR19744.
-// RUN: not %run %t 2>&1 | cat | FileCheck %s
+// RUN: not %run %t 2>&1 | FileCheck %s
 
 #include <windows.h>
 
diff --git a/compiler-rt/test/asan/TestCases/Windows/operator_array_new_uaf.cc b/compiler-rt/test/asan/TestCases/Windows/operator_array_new_uaf.cc
index f4f95ac08427..f48d7a6f1286 100644
--- a/compiler-rt/test/asan/TestCases/Windows/operator_array_new_uaf.cc
+++ b/compiler-rt/test/asan/TestCases/Windows/operator_array_new_uaf.cc
@@ -1,6 +1,5 @@
 // RUN: %clangxx_asan -O0 %s -Fe%t
-// FIXME: 'cat' is needed due to PR19744.
-// RUN: not %run %t 2>&1 | cat | FileCheck %s
+// RUN: not %run %t 2>&1 | FileCheck %s
 
 #include <windows.h>
 
diff --git a/compiler-rt/test/asan/TestCases/Windows/operator_array_new_with_dtor_left_oob.cc b/compiler-rt/test/asan/TestCases/Windows/operator_array_new_with_dtor_left_oob.cc
index aa5f495ee1fd..1702b51edce7 100644
--- a/compiler-rt/test/asan/TestCases/Windows/operator_array_new_with_dtor_left_oob.cc
+++ b/compiler-rt/test/asan/TestCases/Windows/operator_array_new_with_dtor_left_oob.cc
@@ -1,6 +1,5 @@
 // RUN: %clangxx_asan -O0 %s -Fe%t
-// FIXME: 'cat' is needed due to PR19744.
-// RUN: not %run %t 2>&1 | cat | FileCheck %s
+// RUN: not %run %t 2>&1 | FileCheck %s
 
 struct C {
   int x;
diff --git a/compiler-rt/test/asan/TestCases/Windows/operator_delete_wrong_argument.cc b/compiler-rt/test/asan/TestCases/Windows/operator_delete_wrong_argument.cc
index 378b089ec46c..7358cbab826b 100644
--- a/compiler-rt/test/asan/TestCases/Windows/operator_delete_wrong_argument.cc
+++ b/compiler-rt/test/asan/TestCases/Windows/operator_delete_wrong_argument.cc
@@ -1,6 +1,5 @@
 // RUN: %clangxx_asan -O0 %s -Fe%t
-// FIXME: 'cat' is needed due to PR19744.
-// RUN: not %run %t 2>&1 | cat | FileCheck %s
+// RUN: not %run %t 2>&1 | FileCheck %s
 
 #include <windows.h>
 
diff --git a/compiler-rt/test/asan/TestCases/Windows/operator_new_left_oob.cc b/compiler-rt/test/asan/TestCases/Windows/operator_new_left_oob.cc
index 8776ea2eff2c..77454fa0cafd 100644
--- a/compiler-rt/test/asan/TestCases/Windows/operator_new_left_oob.cc
+++ b/compiler-rt/test/asan/TestCases/Windows/operator_new_left_oob.cc
@@ -1,6 +1,5 @@
 // RUN: %clangxx_asan -O0 %s -Fe%t
-// FIXME: 'cat' is needed due to PR19744.
-// RUN: not %run %t 2>&1 | cat | FileCheck %s
+// RUN: not %run %t 2>&1 | FileCheck %s
 
 #include <windows.h>
 
diff --git a/compiler-rt/test/asan/TestCases/Windows/operator_new_right_oob.cc b/compiler-rt/test/asan/TestCases/Windows/operator_new_right_oob.cc
index 135a1016c4e0..e6df9c94dbad 100644
--- a/compiler-rt/test/asan/TestCases/Windows/operator_new_right_oob.cc
+++ b/compiler-rt/test/asan/TestCases/Windows/operator_new_right_oob.cc
@@ -1,6 +1,5 @@
 // RUN: %clangxx_asan -O0 %s -Fe%t
-// FIXME: 'cat' is needed due to PR19744.
-// RUN: not %run %t 2>&1 | cat | FileCheck %s
+// RUN: not %run %t 2>&1 | FileCheck %s
 
 #include <windows.h>
 
diff --git a/compiler-rt/test/asan/TestCases/Windows/operator_new_uaf.cc b/compiler-rt/test/asan/TestCases/Windows/operator_new_uaf.cc
index 35331fb0484f..350598ae95c1 100644
--- a/compiler-rt/test/asan/TestCases/Windows/operator_new_uaf.cc
+++ b/compiler-rt/test/asan/TestCases/Windows/operator_new_uaf.cc
@@ -1,6 +1,5 @@
 // RUN: %clangxx_asan -O0 %s -Fe%t
-// FIXME: 'cat' is needed due to PR19744.
-// RUN: not %run %t 2>&1 | cat | FileCheck %s
+// RUN: not %run %t 2>&1 | FileCheck %s
 
 #include <windows.h>
 
diff --git a/compiler-rt/test/asan/TestCases/Windows/realloc_left_oob.cc b/compiler-rt/test/asan/TestCases/Windows/realloc_left_oob.cc
index eb63d5617edf..511e509da82d 100644
--- a/compiler-rt/test/asan/TestCases/Windows/realloc_left_oob.cc
+++ b/compiler-rt/test/asan/TestCases/Windows/realloc_left_oob.cc
@@ -1,6 +1,5 @@
 // RUN: %clangxx_asan -O0 %s -Fe%t
-// FIXME: 'cat' is needed due to PR19744.
-// RUN: not %run %t 2>&1 | cat | FileCheck %s
+// RUN: not %run %t 2>&1 | FileCheck %s
 
 #include <malloc.h>
 
diff --git a/compiler-rt/test/asan/TestCases/Windows/realloc_right_oob.cc b/compiler-rt/test/asan/TestCases/Windows/realloc_right_oob.cc
index 31dfe7b0ddda..3b0ad194f27b 100644
--- a/compiler-rt/test/asan/TestCases/Windows/realloc_right_oob.cc
+++ b/compiler-rt/test/asan/TestCases/Windows/realloc_right_oob.cc
@@ -1,6 +1,5 @@
 // RUN: %clangxx_asan -O0 %s -Fe%t
-// FIXME: 'cat' is needed due to PR19744.
-// RUN: not %run %t 2>&1 | cat | FileCheck %s
+// RUN: not %run %t 2>&1 | FileCheck %s
 
 #include <malloc.h>
 
diff --git a/compiler-rt/test/asan/TestCases/Windows/realloc_uaf.cc b/compiler-rt/test/asan/TestCases/Windows/realloc_uaf.cc
index f35740b7d47d..45c5598677a6 100644
--- a/compiler-rt/test/asan/TestCases/Windows/realloc_uaf.cc
+++ b/compiler-rt/test/asan/TestCases/Windows/realloc_uaf.cc
@@ -1,6 +1,5 @@
 // RUN: %clangxx_asan -O0 %s -Fe%t
-// FIXME: 'cat' is needed due to PR19744.
-// RUN: not %run %t 2>&1 | cat | FileCheck %s
+// RUN: not %run %t 2>&1 | FileCheck %s
 
 #include <malloc.h>
 
diff --git a/compiler-rt/test/asan/TestCases/Windows/stack_array_left_oob.cc b/compiler-rt/test/asan/TestCases/Windows/stack_array_left_oob.cc
index 22f38fc8d157..65385e234356 100644
--- a/compiler-rt/test/asan/TestCases/Windows/stack_array_left_oob.cc
+++ b/compiler-rt/test/asan/TestCases/Windows/stack_array_left_oob.cc
@@ -1,6 +1,5 @@
 // RUN: %clangxx_asan -O0 %s -Fe%t
-// FIXME: 'cat' is needed due to PR19744.
-// RUN: not %run %t 2>&1 | cat | FileCheck %s
+// RUN: not %run %t 2>&1 | FileCheck %s
 
 #include <stdio.h>
 
diff --git a/compiler-rt/test/asan/TestCases/Windows/stack_array_right_oob.cc b/compiler-rt/test/asan/TestCases/Windows/stack_array_right_oob.cc
index d553e4e9ba20..ac267bf7f27d 100644
--- a/compiler-rt/test/asan/TestCases/Windows/stack_array_right_oob.cc
+++ b/compiler-rt/test/asan/TestCases/Windows/stack_array_right_oob.cc
@@ -1,6 +1,5 @@
 // RUN: %clangxx_asan -O0 %s -Fe%t
-// FIXME: 'cat' is needed due to PR19744.
-// RUN: not %run %t 2>&1 | cat | FileCheck %s
+// RUN: not %run %t 2>&1 | FileCheck %s
 
 #include <stdio.h>
 
diff --git a/compiler-rt/test/asan/TestCases/Windows/stack_use_after_return.cc b/compiler-rt/test/asan/TestCases/Windows/stack_use_after_return.cc
index 03ab70e6a039..1eb64429c2fd 100644
--- a/compiler-rt/test/asan/TestCases/Windows/stack_use_after_return.cc
+++ b/compiler-rt/test/asan/TestCases/Windows/stack_use_after_return.cc
@@ -1,6 +1,5 @@
 // RUN: %clangxx_asan -O0 %s -Fe%t
-// FIXME: 'cat' is needed due to PR19744.
-// RUN: env ASAN_OPTIONS=detect_stack_use_after_return=1 not %run %t 2>&1 | cat | FileCheck %s
+// RUN: env ASAN_OPTIONS=detect_stack_use_after_return=1 not %run %t 2>&1 | FileCheck %s
 
 char *x;
 
diff --git a/compiler-rt/test/asan/TestCases/Windows/thread_stack_array_left_oob.cc b/compiler-rt/test/asan/TestCases/Windows/thread_stack_array_left_oob.cc
index cfc723646f96..30e8ce033482 100644
--- a/compiler-rt/test/asan/TestCases/Windows/thread_stack_array_left_oob.cc
+++ b/compiler-rt/test/asan/TestCases/Windows/thread_stack_array_left_oob.cc
@@ -1,6 +1,5 @@
 // RUN: %clangxx_asan -O0 %s -Fe%t
-// FIXME: 'cat' is needed due to PR19744.
-// RUN: not %run %t 2>&1 | cat | FileCheck %s
+// RUN: not %run %t 2>&1 | FileCheck %s
 
 #include <windows.h>
 
diff --git a/compiler-rt/test/asan/TestCases/Windows/thread_stack_array_right_oob.cc b/compiler-rt/test/asan/TestCases/Windows/thread_stack_array_right_oob.cc
index df5894b7c0e1..365288d6cbde 100644
--- a/compiler-rt/test/asan/TestCases/Windows/thread_stack_array_right_oob.cc
+++ b/compiler-rt/test/asan/TestCases/Windows/thread_stack_array_right_oob.cc
@@ -1,6 +1,5 @@
 // RUN: %clangxx_asan -O0 %s -Fe%t
-// FIXME: 'cat' is needed due to PR19744.
-// RUN: not %run %t 2>&1 | cat | FileCheck %s
+// RUN: not %run %t 2>&1 | FileCheck %s
 
 #include <windows.h>
 
diff --git a/compiler-rt/test/asan/TestCases/Windows/use_after_realloc.cc b/compiler-rt/test/asan/TestCases/Windows/use_after_realloc.cc
index 2ec32a1c36d2..6bd722bb3d07 100644
--- a/compiler-rt/test/asan/TestCases/Windows/use_after_realloc.cc
+++ b/compiler-rt/test/asan/TestCases/Windows/use_after_realloc.cc
@@ -1,6 +1,5 @@
 // RUN: %clangxx_asan -O0 %s -Fe%t
-// FIXME: 'cat' is needed due to PR19744.
-// RUN: not %run %t 2>&1 | cat | FileCheck %s
+// RUN: not %run %t 2>&1 | FileCheck %s
 
 #include <malloc.h>
 
diff --git a/compiler-rt/test/asan/TestCases/Windows/wrong_downcast_on_heap.cc b/compiler-rt/test/asan/TestCases/Windows/wrong_downcast_on_heap.cc
index 3fab7c9c2f50..0f43a6a9310d 100644
--- a/compiler-rt/test/asan/TestCases/Windows/wrong_downcast_on_heap.cc
+++ b/compiler-rt/test/asan/TestCases/Windows/wrong_downcast_on_heap.cc
@@ -1,6 +1,5 @@
 // RUN: %clangxx_asan -O0 %s -Fe%t
-// FIXME: 'cat' is needed due to PR19744.
-// RUN: not %run %t 2>&1 | cat | FileCheck %s
+// RUN: not %run %t 2>&1 | FileCheck %s
 
 class Parent {
  public:
diff --git a/compiler-rt/test/asan/TestCases/Windows/wrong_downcast_on_stack.cc b/compiler-rt/test/asan/TestCases/Windows/wrong_downcast_on_stack.cc
index 918f23fb9baa..02c9b9f06bc7 100644
--- a/compiler-rt/test/asan/TestCases/Windows/wrong_downcast_on_stack.cc
+++ b/compiler-rt/test/asan/TestCases/Windows/wrong_downcast_on_stack.cc
@@ -1,6 +1,5 @@
 // RUN: %clangxx_asan -O0 %s -Fe%t
-// FIXME: 'cat' is needed due to PR19744.
-// RUN: not %run %t 2>&1 | cat | FileCheck %s
+// RUN: not %run %t 2>&1 | FileCheck %s
 
 class Parent {
  public: