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 +--
 compiler-rt/test/asan/TestCases/Windows/dll_intercept_memcpy.cc        | 3 +--
 compiler-rt/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 +--
 .../test/asan/TestCases/Windows/dll_operator_array_new_left_oob.cc     | 3 +--
 .../TestCases/Windows/dll_operator_array_new_with_dtor_left_oob.cc     | 3 +--
 compiler-rt/test/asan/TestCases/Windows/dll_poison_unpoison.cc         | 3 +--
 compiler-rt/test/asan/TestCases/Windows/dll_stack_use_after_return.cc  | 3 +--
 .../test/asan/TestCases/Windows/dll_thread_stack_array_left_oob.cc     | 3 +--
 compiler-rt/test/asan/TestCases/Windows/double_free.cc                 | 3 +--
 compiler-rt/test/asan/TestCases/Windows/double_operator_delete.cc      | 3 +--
 compiler-rt/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 +--
 compiler-rt/test/asan/TestCases/Windows/operator_array_new_left_oob.cc | 3 +--
 .../test/asan/TestCases/Windows/operator_array_new_right_oob.cc        | 3 +--
 compiler-rt/test/asan/TestCases/Windows/operator_array_new_uaf.cc      | 3 +--
 .../asan/TestCases/Windows/operator_array_new_with_dtor_left_oob.cc    | 3 +--
 .../test/asan/TestCases/Windows/operator_delete_wrong_argument.cc      | 3 +--
 compiler-rt/test/asan/TestCases/Windows/operator_new_left_oob.cc       | 3 +--
 compiler-rt/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 +--
 compiler-rt/test/asan/TestCases/Windows/stack_array_left_oob.cc        | 3 +--
 compiler-rt/test/asan/TestCases/Windows/stack_array_right_oob.cc       | 3 +--
 compiler-rt/test/asan/TestCases/Windows/stack_use_after_return.cc      | 3 +--
 compiler-rt/test/asan/TestCases/Windows/thread_stack_array_left_oob.cc | 3 +--
 .../test/asan/TestCases/Windows/thread_stack_array_right_oob.cc        | 3 +--
 compiler-rt/test/asan/TestCases/Windows/use_after_realloc.cc           | 3 +--
 compiler-rt/test/asan/TestCases/Windows/wrong_downcast_on_heap.cc      | 3 +--
 compiler-rt/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 2e63956..63f3941 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 d005e08..71399a7 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 f013d8b..fcf3138 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 824d2b8..5a1d936 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 ffa3bf9..8a69e7d 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 684c82c..caac426 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 cc96dd4..8064b83 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 7a37b44..5842999 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 90e0c11..4b5bf33 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 0c98322..509e0af 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 c014b4b..09302c3 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 6051a1f..24f98dd 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 322aa53..22d9970 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 e777e1b..a84eeb9 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 de0c0b5..6745c59 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 795af4a..1cd7080 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 ade39fe..b54a2bb 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 64f38da..73ce951 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 1e1a26d..1bc235f 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 f32f4033..62a5be8 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 bf83ad4..2f6516e 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 0d6b611..ba1bf93 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 aac64ba..3f873cc 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 33b6377..082cf4c4 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 8af6da1..1465fa0 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 f4f95ac..f48d7a6 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 aa5f495..1702b51 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 378b089..7358cba 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 8776ea2..77454fa 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 135a101..e6df9c9 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 35331fb..350598a 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 eb63d56..511e509 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 31dfe7b..3b0ad19 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 f35740b..45c5598 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 22f38fc..65385e2 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 d553e4e..ac267bf 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 03ab70e..1eb64429 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 cfc72364..30e8ce0 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 df5894b..365288d 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 2ec32a1..6bd722b 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 3fab7c9..0f43a6a 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 918f23f..02c9b9f 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:
-- 
2.7.4