[PATCH] D31425: Add missing FileCheck, update CHECK lines and avoid subshell

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

rafael created this revision.
Herald added a subscriber: kubamracek.

I noticed that this file had CHECK lines but no FileCheck run.


https://reviews.llvm.org/D31425

Files:
  compiler-rt/test/asan/TestCases/Posix/coverage-fork-direct.cc


Index: compiler-rt/test/asan/TestCases/Posix/coverage-fork-direct.cc
===================================================================
--- compiler-rt/test/asan/TestCases/Posix/coverage-fork-direct.cc
+++ compiler-rt/test/asan/TestCases/Posix/coverage-fork-direct.cc
@@ -1,8 +1,10 @@
 // RUN: %clangxx_asan -fsanitize-coverage=func %s -o %t
 // RUN: rm -rf %T/coverage-fork-direct
 // RUN: mkdir -p %T/coverage-fork-direct && cd %T/coverage-fork-direct
-// RUN: (%env_asan_opts=coverage=1:coverage_direct=1:verbosity=1 %run %t; \
-// RUN:  %sancov rawunpack *.sancov.raw; %sancov print *.sancov) 2>&1
+// RUN: %env_asan_opts=coverage=1:coverage_direct=1:verbosity=1 %run %t > %t.log 2>&1
+// RUN: %sancov rawunpack *.sancov.raw
+// RUN: %sancov print *.sancov >> %t.log 2>&1
+// RUN: FileCheck %s < %t.log
 //
 // XFAIL: android
 
@@ -34,5 +36,4 @@
 
 // CHECK-DAG: Child PID: [[ChildPID:[0-9]+]]
 // CHECK-DAG: Parent PID: [[ParentPID:[0-9]+]]
-// CHECK-DAG: read 3 PCs from {{.*}}.[[ParentPID]].sancov
-// CHECK-DAG: read 1 PCs from {{.*}}.[[ChildPID]].sancov
+// CHECK: read 3 64-bit PCs from {{.*}}.[[ParentPID]].sancov


-------------- next part --------------
A non-text attachment was scrubbed...
Name: D31425.93257.patch
Type: text/x-patch
Size: 1126 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/llvm-commits/attachments/20170328/bae1221a/attachment.bin>