[PATCH] D31433: Use count instead of grep -c

[Rafael Ávila de Espíndola via Phabricator via llvm-commits]

rafael updated this revision to Diff 93275.

https://reviews.llvm.org/D31433

Files:
  compiler-rt/test/asan/TestCases/Posix/halt_on_error-torture.cc
  compiler-rt/test/asan/TestCases/Posix/halt_on_error_suppress_equal_pcs.cc


Index: compiler-rt/test/asan/TestCases/Posix/halt_on_error_suppress_equal_pcs.cc
===================================================================
--- compiler-rt/test/asan/TestCases/Posix/halt_on_error_suppress_equal_pcs.cc
+++ compiler-rt/test/asan/TestCases/Posix/halt_on_error_suppress_equal_pcs.cc
@@ -8,15 +8,15 @@
 // Check that we die after reaching different reports number threshold.
 // RUN: rm -f %t1.log
 // RUN: %env_asan_opts=halt_on_error=false not %run %t 1 >> %t1.log 2>&1
-// RUN: [ $(grep -c 'ERROR: AddressSanitizer: stack-buffer-overflow' %t1.log) -eq 25 ]
+// RUN: grep 'ERROR: AddressSanitizer: stack-buffer-overflow' %t1.log | count 25
 //
 // Check suppress_equal_pcs=true behavior is equal to default one.
 // RUN: %env_asan_opts=halt_on_error=false:suppress_equal_pcs=true %run %t 2>&1 | FileCheck %s
 //
 // Check suppress_equal_pcs=false behavior isn't equal to default one.
 // RUN: rm -f %t2.log
 // RUN: %env_asan_opts=halt_on_error=false:suppress_equal_pcs=false %run %t >> %t2.log 2>&1
-// RUN: [ $(grep -c 'ERROR: AddressSanitizer: stack-buffer-overflow' %t2.log) -eq 30 ]
+// RUN: grep 'ERROR: AddressSanitizer: stack-buffer-overflow' %t2.log | count 30
 
 #define ACCESS_ARRAY_FIVE_ELEMENTS(array, i)     \
   array[i] = i;                                  \
Index: compiler-rt/test/asan/TestCases/Posix/halt_on_error-torture.cc
===================================================================
--- compiler-rt/test/asan/TestCases/Posix/halt_on_error-torture.cc
+++ compiler-rt/test/asan/TestCases/Posix/halt_on_error-torture.cc
@@ -5,7 +5,7 @@
 // RUN: rm -f 1.txt
 // RUN: %env_asan_opts=halt_on_error=false:suppress_equal_pcs=false %run %t 1 10 >>1.txt 2>&1
 // RUN: FileCheck %s < 1.txt
-// RUN: [ $(grep -c 'ERROR: AddressSanitizer: use-after-poison' 1.txt) -eq 10 ]
+// RUN: grep 'ERROR: AddressSanitizer: use-after-poison' 1.txt | count 10
 // RUN: FileCheck --check-prefix=CHECK-NO-COLLISION %s < 1.txt
 //
 // Collisions are unlikely but still possible so we need the ||.


-------------- next part --------------
A non-text attachment was scrubbed...
Name: D31433.93275.patch
Type: text/x-patch
Size: 2023 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/llvm-commits/attachments/20170328/7e6a881e/attachment.bin>