[llvm] r312747 - Fix llvm-xray tests to avoid subshells

[Reid Kleckner via llvm-commits]

Author: rnk
Date: Thu Sep  7 14:28:09 2017
New Revision: 312747

URL: http://llvm.org/viewvc/llvm-project?rev=312747&view=rev
Log:
Fix llvm-xray tests to avoid subshells

We already uses pipefail to detect failure of a redirected command, so
the "|| echo failure" construct was unnecessary.

These tests run and pass on Windows now.

Modified:
    llvm/trunk/test/tools/llvm-xray/X86/stack-empty-case.yaml
    llvm/trunk/test/tools/llvm-xray/X86/stack-keep-going.yaml

Modified: llvm/trunk/test/tools/llvm-xray/X86/stack-empty-case.yaml
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/tools/llvm-xray/X86/stack-empty-case.yaml?rev=312747&r1=312746&r2=312747&view=diff
==============================================================================
--- llvm/trunk/test/tools/llvm-xray/X86/stack-empty-case.yaml (original)
+++ llvm/trunk/test/tools/llvm-xray/X86/stack-empty-case.yaml Thu Sep  7 14:28:09 2017
@@ -1,9 +1,4 @@
-# The redirects used in the commands to FileCheck against stderr cannot be used
-# with a windows test.
-#
-# UNSUPPORTED: windows
-
-#RUN: (llvm-xray stack %s 2>&1 || echo "Checking Command Failed") | FileCheck %s
+# RUN: not llvm-xray stack %s 2>&1 | FileCheck %s
 ---
 header:
   version: 1
@@ -14,5 +9,4 @@ header:
 records:
 ...
 # CHECK:     llvm-xray: No instrumented calls were accounted in the input file.
-# CHECK:     Checking Command Failed
 # CHECK-NOT: {{[0-9A-Z]+}}

Modified: llvm/trunk/test/tools/llvm-xray/X86/stack-keep-going.yaml
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/tools/llvm-xray/X86/stack-keep-going.yaml?rev=312747&r1=312746&r2=312747&view=diff
==============================================================================
--- llvm/trunk/test/tools/llvm-xray/X86/stack-keep-going.yaml (original)
+++ llvm/trunk/test/tools/llvm-xray/X86/stack-keep-going.yaml Thu Sep  7 14:28:09 2017
@@ -1,11 +1,6 @@
-# The redirects used in the commands to FileCheck against stderr cannot be used
-# with a windows test.
-#
-# UNSUPPORTED: windows
-
-#RUN: (llvm-xray stack %s 2>&1 1>&- || echo "Check Command Failed") | FileCheck --check-prefix HALT %s
-#RUN: (llvm-xray stack -k %s 2>&1 && echo "Check Command Succeeded") | FileCheck --check-prefix KEEP-GOING-SUCCEEDS %s
-#RUN: llvm-xray stack -k %s | FileCheck --check-prefix KEEP-GOING %s
+# RUN: not llvm-xray stack %s 2>&1 | FileCheck --check-prefix HALT %s
+# RUN: llvm-xray stack -k %s 2>&1 | FileCheck --check-prefix KEEP-GOING-SUCCEEDS %s
+# RUN: llvm-xray stack -k %s | FileCheck --check-prefix KEEP-GOING %s
 ---
 header:
   version: 1
@@ -24,10 +19,8 @@ records:
   - { type: 1, func-id: 1, cpu: 1, thread: 111, kind: function-exit, tsc: 10775 }
 ...
 
-#HALT: llvm-xray: Found record {FuncId: "#4", ThreadId: "111", RecordType: "Fn Exit"} with no matching function entry
-#HALT: Check Command Failed
+# HALT: llvm-xray: Found record {FuncId: "#4", ThreadId: "111", RecordType: "Fn Exit"} with no matching function entry
 #KEEP-GOING-SUCCEEDS: Found record {FuncId: "#4", ThreadId: "111", RecordType: "Fn Exit"} with no matching function entry
-#KEEP-GOING-SUCCEEDS: Check Command Succeeded
 #KEEP-GOING: Unique Stacks: 2
 # Note the interesting case here that the stack { fn-1 } is a prefix of { fn-1, fn-2, fn-3 } but they
 # are still counted as unique stacks.