--- a/test/ThinLTO/X86/diagnostic-handler-remarks.ll	Fri Nov 25 19:14:25 2016 +0900
+++ b/test/ThinLTO/X86/diagnostic-handler-remarks.ll	Fri Oct 27 17:07:41 2017 +0900
@@ -2,6 +2,7 @@
 ; RUN: opt -module-summary %p/Inputs/diagnostic-handler-remarks.ll -o %t2.bc
 
 ; Optimization records are collected regardless of the diagnostic handler
+; RUN: rm -f %t.yaml.thin.0.yaml %t.yaml.thin.1.yaml
 ; RUN: llvm-lto -thinlto-action=run \
 ; RUN:          -lto-pass-remarks-output=%t.yaml \
 ; RUN:          -exported-symbol _func2 \
@@ -13,28 +14,38 @@
 
 ; Verify that bar is imported and inlined into foo
 ; RUN: cat %t.yaml.thin.0.yaml | FileCheck %s -check-prefix=YAML1
-; YAML1: --- !Passed
-; YAML1: Pass:            inline
-; YAML1: Name:            Inlined
-; YAML1: Function:        main
-; YAML1: Args:
-; YAML1:   - Callee:          foo
-; YAML1:   - String:          ' inlined into '
-; YAML1:   - Caller:          main
-; YAML1: ...
+; YAML1:      --- !Passed
+; YAML1-NEXT: Pass:            inline
+; YAML1-NEXT: Name:            Inlined
+; YAML1-NEXT: Function:        main
+; YAML1-NEXT: Args:
+; YAML1-NEXT:   - Callee:          foo
+; YAML1-NEXT:   - String:          ' inlined into '
+; YAML1-NEXT:   - Caller:          main
+; YAML1-NEXT:   - String:          ' with cost='
+; YAML1-NEXT:   - Cost:            '-30'
+; YAML1-NEXT:   - String:          ' (threshold='
+; YAML1-NEXT:   - Threshold:       '337'
+; YAML1-NEXT:   - String:          ')'
+; YAML1-NEXT: ...
 
 
 ; Verify that bar is imported and inlined into foo
 ; RUN: cat %t.yaml.thin.1.yaml | FileCheck %s -check-prefix=YAML2
 ; YAML2: --- !Passed
-; YAML2: Pass:            inline
-; YAML2: Name:            Inlined
-; YAML2: Function:        foo
-; YAML2: Args:
-; YAML2:   - Callee:          bar
-; YAML2:   - String:          ' inlined into '
-; YAML2:   - Caller:          foo
-; YAML2: ...
+; YAML2-NEXT: Pass:            inline
+; YAML2-NEXT: Name:            Inlined
+; YAML2-NEXT: Function:        foo
+; YAML2-NEXT: Args:
+; YAML2-NEXT:   - Callee:          bar
+; YAML2-NEXT:   - String:          ' inlined into '
+; YAML2-NEXT:   - Caller:          foo
+; YAML2-NEXT:   - String:          ' with cost='
+; YAML2-NEXT:   - Cost:            '-30'
+; YAML2-NEXT:   - String:          ' (threshold='
+; YAML2-NEXT:   - Threshold:       '337'
+; YAML2-NEXT:   - String:          ')'
+; YAML2-NEXT: ...
 
 
 target datalayout = "e-m:o-i64:64-f80:128-n8:16:32:64-S128"