Index: llvm/test/tools/llvm-cxxmap/Inputs/expected
===================================================================
--- llvm/test/tools/llvm-cxxmap/Inputs/expected
+++ /dev/null
@@ -1,2 +0,0 @@
-_ZN3foo4quux1fEv _ZN3foo6detail3qux1fEv
-_ZN1N1fENS_1X1YE _ZN1N1fEN1M1X1YE
Index: llvm/test/tools/llvm-cxxmap/remap.test
===================================================================
--- llvm/test/tools/llvm-cxxmap/remap.test
+++ llvm/test/tools/llvm-cxxmap/remap.test
@@ -1,5 +1,10 @@
-RUN: llvm-cxxmap %S/Inputs/before.sym %S/Inputs/after.sym -r %S/Inputs/remap.map -o %t.output -Wambiguous -Wincomplete 2>&1 | FileCheck %s --allow-empty
-RUN: diff %S/Inputs/expected %t.output
+RUN: llvm-cxxmap %S/Inputs/before.sym %S/Inputs/after.sym \
+RUN:             -r %S/Inputs/remap.map -o %t.output -Wambiguous -Wincomplete
+RUN:     2>&1 | FileCheck --check-prefix=CXXMAP %s --allow-empty
+RUN: cat %t.output | FileCheck --check-prefix=OUTPUT %s
 
-CHECK-NOT: warning
-CHECK-NOT: error
+CXXMAP-NOT: warning
+CXXMAP-NOT: error
+
+OUTPUT: _ZN3foo4quux1fEv _ZN3foo6detail3qux1fEv
+OUTPUT: _ZN1N1fENS_1X1YE _ZN1N1fEN1M1X1YE
Index: llvm/test/tools/llvm-profdata/Inputs/instr-remap.expected
===================================================================
--- llvm/test/tools/llvm-profdata/Inputs/instr-remap.expected
+++ /dev/null
@@ -1,29 +0,0 @@
-# IR level Instrumentation Flag
-:ir
-bar
-# Func Hash:
-1234
-# Num Counters:
-2
-# Counter Values:
-31
-42
-
-bar
-# Func Hash:
-5678
-# Num Counters:
-2
-# Counter Values:
-500
-600
-
-baz
-# Func Hash:
-5678
-# Num Counters:
-2
-# Counter Values:
-7
-8
-
Index: llvm/test/tools/llvm-profdata/Inputs/sample-remap.expected
===================================================================
--- llvm/test/tools/llvm-profdata/Inputs/sample-remap.expected
+++ /dev/null
@@ -1,16 +0,0 @@
-main:184019:0
- 4: 534
- 4.2: 534
- 5: 1075
- 5.1: 1075
- 6: 2080
- 7: 534
- 9: 2064 _Z3bazi:1471 _Z3fooi:631
- 10: inline2:2000
-  1: 2000
- 10: inline42:1000
-  1: 1000
-_Z3bazi:40602:2437
- 1: 2437
-_Z3fooi:7711:610
- 1: 610
Index: llvm/test/tools/llvm-profdata/instr-remap.test
===================================================================
--- llvm/test/tools/llvm-profdata/instr-remap.test
+++ llvm/test/tools/llvm-profdata/instr-remap.test
@@ -1,2 +1,34 @@
-; RUN: llvm-profdata merge -text %S/Inputs/instr-remap.proftext -r %S/Inputs/instr-remap.remap -o %t.output
-; RUN: diff %S/Inputs/instr-remap.expected %t.output
+; RUN: llvm-profdata merge -text %S/Inputs/instr-remap.proftext \
+; RUN:               -r %S/Inputs/instr-remap.remap -o %t.output
+; RUN: cat %t.output | FileCheck --check-prefixes=CHECK,BAR1 %s
+; RUN: cat %t.output | FileCheck --check-prefixes=CHECK,BAR2 %s
+; RUN: cat %t.output | FileCheck --check-prefixes=CHECK,BAZ %s
+
+; CHECK: # IR level Instrumentation Flag
+; CHECK: :ir
+; BAR1: bar
+; BAR1: # Func Hash:
+; BAR1: 1234
+; BAR1: # Num Counters:
+; BAR1: 2
+; BAR1: # Counter Values:
+; BAR1: 31
+; BAR1: 42
+
+; BAR2: bar
+; BAR2: # Func Hash:
+; BAR2: 5678
+; BAR2: # Num Counters:
+; BAR2: 2
+; BAR2: # Counter Values:
+; BAR2: 500
+; BAR2: 600
+
+; BAZ: baz
+; BAZ: # Func Hash:
+; BAZ: 5678
+; BAZ: # Num Counters:
+; BAZ: 2
+; BAZ: # Counter Values:
+; BAZ: 7
+; BAZ: 8
Index: llvm/test/tools/llvm-profdata/sample-remap.test
===================================================================
--- llvm/test/tools/llvm-profdata/sample-remap.test
+++ llvm/test/tools/llvm-profdata/sample-remap.test
@@ -1,2 +1,20 @@
-; RUN: llvm-profdata merge -sample -text %S/Inputs/sample-remap.proftext -r %S/Inputs/sample-remap.remap -o %t.output
-; RUN: diff %S/Inputs/sample-remap.expected %t.output
+; RUN: llvm-profdata merge -sample -text %S/Inputs/sample-remap.proftext \
+; RUN:               -r %S/Inputs/sample-remap.remap -o %t.output
+; RUN: cat %t.output | FileCheck %s
+
+; CHECK: main:184019:0
+; CHECK:  4: 534
+; CHECK:  4.2: 534
+; CHECK:  5: 1075
+; CHECK:  5.1: 1075
+; CHECK:  6: 2080
+; CHECK:  7: 534
+; CHECK:  9: 2064 _Z3bazi:1471 _Z3fooi:631
+; CHECK:  10: inline2:2000
+; CHECK:   1: 2000
+; CHECK:  10: inline42:1000
+; CHECK:   1: 1000
+; CHECK: _Z3bazi:40602:2437
+; CHECK:  1: 2437
+; CHECK: _Z3fooi:7711:610
+; CHECK:  1: 610