From 198b071255e10d9c75114117d0400d64aebbaf8d Mon Sep 17 00:00:00 2001 From: Stanislav Pankevich Date: Tue, 19 Nov 2019 21:45:41 +0100 Subject: [PATCH] CHECK/two_strings/04-negative_match_second_string/sample.itest: complete most of the checks --- .../sample.itest | 2 +- .../sample.itest | 23 ++++++++++--------- 2 files changed, 13 insertions(+), 12 deletions(-) diff --git a/tests/integration/tests/basic_functionality/check_commands/CHECK/two_strings/03-negative_match_first_string/sample.itest b/tests/integration/tests/basic_functionality/check_commands/CHECK/two_strings/03-negative_match_first_string/sample.itest index dab0374..38692f6 100644 --- a/tests/integration/tests/basic_functionality/check_commands/CHECK/two_strings/03-negative_match_first_string/sample.itest +++ b/tests/integration/tests/basic_functionality/check_commands/CHECK/two_strings/03-negative_match_first_string/sample.itest @@ -5,7 +5,7 @@ ; CHECK-NEXT: {{^}} ^{{$}} ; CHECK-NEXT: {{^:.*:.*: note: scanning from here$}} ; CHECK-NEXT: hello1 -; CHECK-NEXT: ^ +; CHECK-NEXT: {{^\^$}} ; CHECK-NEXT: {{^:.*:.*: note: possible intended match here$}} ; CHECK: {{^.*$}} ; CHECK: ^ diff --git a/tests/integration/tests/basic_functionality/check_commands/CHECK/two_strings/04-negative_match_second_string/sample.itest b/tests/integration/tests/basic_functionality/check_commands/CHECK/two_strings/04-negative_match_second_string/sample.itest index b663218..57f36af 100644 --- a/tests/integration/tests/basic_functionality/check_commands/CHECK/two_strings/04-negative_match_second_string/sample.itest +++ b/tests/integration/tests/basic_functionality/check_commands/CHECK/two_strings/04-negative_match_second_string/sample.itest @@ -1,12 +1,13 @@ -; RUN: cat %S/filecheck.input | (%FILECHECK_EXEC %S/filecheck.check 2>&1 || true) | %FILECHECK_TESTER_EXEC %s +; RUN: cat %S/filecheck.input | (%FILECHECK_EXEC %S/filecheck.check 2>&1 || true) | %FILECHECK_TESTER_EXEC %s --match-full-lines ; CHECK: {{^.*}}FileCheck{{$}} -; CHECK {{.*}}filecheck.check:1:.*: error: CHECK: expected string not found in input{{$}} -; CHECK {{^}}; CHECK: foo{{$}} -; CHECK {{^}} ^{{$}} -; CHECK {{^}}:.*:.*: note: scanning from here{{$}} -; CHECK {{^}}hello{{$}} -; CHECK {{^}}^{{$}} -; CHECK {{^}}:.*:.*: note: possible intended match here{{$}} -; CHECK {{^}}hello{{$}} -; CHECK: {{^}} ^{{$}} -; CHECK-EMPTY +; CHECK: {{.*filecheck.check:2:10: error: CHECK: expected string not found in input$}} +; CHECK: {{^}}; CHECK: foo{{$}} +; CHECK: {{^}} ^{{$}} +; TODO: The array of checks being scanned has to be maintained. +; CHECK: {{^:.*:.*: note: scanning from here$}} +; CHECK: {{^.*$}} +; CHECK: ^{{$}} +; CHECK: {{^:.*:.*: note: possible intended match here$}} +; CHECK: {{^.*$}} +; CHECK: ^ +; CHECK-EMPTY: