Merge pull request #9 from stanislaw/develop-alt

CHECK/two_strings/04-negative_match_second_string/sample.itest: complete most of the checks
mull-project · Nov 19, 2019 · 04f5642 · 04f5642
2 parents c7d4336 + 198b071
commit 04f5642
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 12 deletions.
diff --git a/...unctionality/check_commands/CHECK/two_strings/03-negative_match_first_string/sample.itest b/...unctionality/check_commands/CHECK/two_strings/03-negative_match_first_string/sample.itest
@@ -5,7 +5,7 @@
 ; CHECK-NEXT: {{^}}         ^{{$}}
 ; CHECK-NEXT: {{^<stdin>:.*:.*: note: scanning from here$}}
 ; CHECK-NEXT: hello1
-; CHECK-NEXT: ^
+; CHECK-NEXT: {{^\^$}}
 ; CHECK-NEXT: {{^<stdin>:.*:.*: note: possible intended match here$}}
 ; CHECK: {{^.*$}}
 ; CHECK: ^

diff --git a/...nctionality/check_commands/CHECK/two_strings/04-negative_match_second_string/sample.itest b/...nctionality/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 {{^}}<stdin>:.*:.*: note: scanning from here{{$}}
-; CHECK {{^}}hello{{$}}
-; CHECK {{^}}^{{$}}
-; CHECK {{^}}<stdin>:.*:.*: 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: {{^<stdin>:.*:.*: note: scanning from here$}}
+; CHECK: {{^.*$}}
+; CHECK: ^{{$}}
+; CHECK: {{^<stdin>:.*:.*: note: possible intended match here$}}
+; CHECK: {{^.*$}}
+; CHECK: ^
+; CHECK-EMPTY: