Skip to content

Commit

Permalink
Merge pull request #127 from stanislaw/windows-more-fixes
Browse files Browse the repository at this point in the history 
 tests: fix remaining test ?= lines
  • Loading branch information
@stanislaw
stanislaw authored Apr 13, 2020
2 parents 5085aa3 + b56e99f commit 251d078
Show file tree
Hide file tree
Showing 11 changed files with 15 additions and 13 deletions.
2 changes: 1 addition & 1 deletion ...OT/multiple_strings/02-CHECK-NOT-is-the-last-check-and-multiple-to-check-yet/sample.itest
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
; RUN: %cat "%S/filecheck.input" | (%FILECHECK_EXEC "%S/filecheck.check" 2>&1; test $? = 1;) | %FILECHECK_TESTER_EXEC "%s" --strict-whitespace --match-full-lines
; RUN: %cat "%S/filecheck.input" | %expect_exit 1 %FILECHECK_EXEC "%S/filecheck.check" | %FILECHECK_TESTER_EXEC "%s" --strict-whitespace --match-full-lines

; CHECK:{{^.*}}filecheck.check:1:13: error: CHECK-NOT: excluded string found in input{{$}}
; CHECK:; CHECK-NOT:String5
Expand Down
3 changes: 2 additions & 1 deletion ...NOT/multiple_strings/07-multiple-CHECK-NOT-do-not-get-shadowed-by-each-other/sample.itest
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
; RUN: %cat "%S/filecheck.input" | (%FILECHECK_EXEC "%S/filecheck.check" 2>&1; test $? = 1;) | %FILECHECK_TESTER_EXEC "%s" --strict-whitespace --match-full-lines
; RUN: %cat "%S/filecheck.input" | %expect_exit 1 %FILECHECK_EXEC "%S/filecheck.check" | %FILECHECK_TESTER_EXEC "%s" --strict-whitespace --match-full-lines

; CHECK:{{^.*}}filecheck.check:1:13: error: CHECK-NOT: excluded string found in input
; CHECK:; CHECK-NOT:warning
; CHECK: ^
Expand Down
2 changes: 1 addition & 1 deletion ...n/tests/check_commands/CHECK-NOT/one_string/negative/03-negative_match_regex/sample.itest
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
; RUN: %cat "%S/filecheck.input" | (%FILECHECK_EXEC "%S/filecheck.check" 2>&1; test $? == 1;) | %FILECHECK_TESTER_EXEC "%s" --match-full-lines
; RUN: %cat "%S/filecheck.input" | %expect_exit 1 %FILECHECK_EXEC "%S/filecheck.check" | %FILECHECK_TESTER_EXEC "%s" --match-full-lines

; CHECK: {{^.*}}filecheck.check:1:14: error: CHECK-NOT: excluded string found in input{{$}}
; TODO: Here we could do a better match.
Expand Down
2 changes: 1 addition & 1 deletion ...nds/CHECK/one_string/negative-match/04-negative_match_no_input_lines_anymore/sample.itest
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
; RUN: %cat "%S/filecheck.input" | (%FILECHECK_EXEC "%S/filecheck.check" 2>&1; test $? = 1;) | %FILECHECK_TESTER_EXEC "%s" --strict-whitespace --match-full-lines
; RUN: %cat "%S/filecheck.input" | %expect_exit 1 %FILECHECK_EXEC "%S/filecheck.check" | %FILECHECK_TESTER_EXEC "%s" --strict-whitespace --match-full-lines

; CHECK:{{^.*}}filecheck.check:2:8: error: CHECK: expected string not found in input{{$}}
; CHECK:CHECK: String2
Expand Down
2 changes: 1 addition & 1 deletion ...tion/tests/check_commands/CHECK/three_strings/03-negative_match_first_string/sample.itest
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
; RUN: %cat "%S/filecheck.input" | (%FILECHECK_EXEC "%S/filecheck.check" 2>&1; test $? = 1) | %FILECHECK_TESTER_EXEC "%s" --match-full-lines
; RUN: %cat "%S/filecheck.input" | %expect_exit 1 %FILECHECK_EXEC "%S/filecheck.check" | %FILECHECK_TESTER_EXEC "%s" --match-full-lines

; CHECK: {{.*filecheck.check:1:.*: error: CHECK: expected string not found in input$}}
; CHECK-NEXT: {{^}}; CHECK: foo{{$}}
Expand Down
2 changes: 1 addition & 1 deletion tests/integration/tests/invalid_input/03_empty_check_file/sample.itest
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
; RUN: printf "" | (%FILECHECK_EXEC "%S/filecheck.check" 2>&1; test $? = 2) | %FILECHECK_TESTER_EXEC "%s" --match-full-lines
; RUN: printf "" | %expect_exit 2 %FILECHECK_EXEC "%S/filecheck.check" | %FILECHECK_TESTER_EXEC "%s" --match-full-lines

; CHECK: error: no check strings found with prefix 'CHECK:'
; CHECK-EMPTY
2 changes: 1 addition & 1 deletion tests/integration/tests/invalid_input/06_empty_input_file/sample.itest
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
; RUN: %cat "%S/filecheck.input" | (%FILECHECK_EXEC "%S/filecheck.check" 2>&1; test $? = 2) | %FILECHECK_TESTER_EXEC %s
; RUN: %cat "%S/filecheck.input" | %expect_exit 2 %FILECHECK_EXEC "%S/filecheck.check" | %FILECHECK_TESTER_EXEC "%s"

; CHECK: FileCheck error: '-' is empty.
; CHECK: FileCheck command line: {{.*}}.check{{$}}
2 changes: 1 addition & 1 deletion ...ed/02_when_strict_whitespace_then_leading_whitespace_is_not_ignored/02_regex/sample.itest
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
; RUN: cat "%S/filecheck.input" | %expect_exit 0 --expect-no-content %FILECHECK_EXEC "%S/filecheck.check" --match-full-lines --strict-whitespace
; RUN: %cat "%S/filecheck.input" | %expect_exit 0 --expect-no-content %FILECHECK_EXEC "%S/filecheck.check" --match-full-lines --strict-whitespace
4 changes: 2 additions & 2 deletions ...n/tests/options/--strict-whitespace/CHECK/01_input_has_mixed_spaces_and_tabs/sample.itest
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
; RUN: cat "%S/filecheck.input" | %expect_exit 0 --expect-no-content %FILECHECK_EXEC "%S/filecheck.check"
; RUN: cat "%S/filecheck.input" | %expect_exit 1 %FILECHECK_EXEC "%S/filecheck.check" --strict-whitespace | %FILECHECK_TESTER_EXEC "%s" --match-full-lines -check-prefix=OPTION
; RUN: %cat "%S/filecheck.input" | %expect_exit 0 --expect-no-content %FILECHECK_EXEC "%S/filecheck.check"
; RUN: %cat "%S/filecheck.input" | %expect_exit 1 %FILECHECK_EXEC "%S/filecheck.check" --strict-whitespace | %FILECHECK_TESTER_EXEC "%s" --match-full-lines -check-prefix=OPTION

; OPTION: {{^.*}}filecheck.check:1:10: error: CHECK: expected string not found in input{{$}}
; OPTION: ; CHECK: hello world hello world
Expand Down
4 changes: 2 additions & 2 deletions ...sts/options/--strict-whitespace/CHECK_NOT/02_check_has_mixed_spaces_and_tabs/sample.itest
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
; RUN: cat "%S/filecheck.input" | %expect_exit 0 --expect-no-content %FILECHECK_EXEC "%S/filecheck.check"
; RUN: cat "%S/filecheck.input" | %expect_exit 1 %FILECHECK_EXEC "%S/filecheck.check" --strict-whitespace | %FILECHECK_TESTER_EXEC "%s" --strict-whitespace --match-full-lines -check-prefix=OPTION
; RUN: %cat "%S/filecheck.input" | %expect_exit 0 --expect-no-content %FILECHECK_EXEC "%S/filecheck.check"
; RUN: %cat "%S/filecheck.input" | %expect_exit 1 %FILECHECK_EXEC "%S/filecheck.check" --strict-whitespace | %FILECHECK_TESTER_EXEC "%s" --strict-whitespace --match-full-lines -check-prefix=OPTION

; OPTION:{{^.*}}filecheck.check:1:10: error: CHECK: expected string not found in input{{$}}
; OPTION:; CHECK: hello world hello world
Expand Down
3 changes: 2 additions & 1 deletion ...tegration/tests/real_world_samples/mull/02-weird-scanning-from-here-location/sample.itest
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
; RUN: %cat "%S/filecheck.input" | (%FILECHECK_EXEC "%S/filecheck.check" --strict-whitespace --match-full-lines --check-prefix=WITH-OPTION 2>&1; test $? = 1;) | %FILECHECK_TESTER_EXEC "%s" --strict-whitespace --match-full-lines
; RUN: %cat "%S/filecheck.input" | %expect_exit 1 %FILECHECK_EXEC "%S/filecheck.check" --strict-whitespace --match-full-lines --check-prefix=WITH-OPTION | %FILECHECK_TESTER_EXEC "%s" --strict-whitespace --match-full-lines

; CHECK:{{^.*}}filecheck.check:23:15: error: WITH-OPTION: expected string not found in input
; CHECK-NEXT:{{^; WITH-OPTION:..\^Running mutsants \\\(threads: 2\\\): 2\\\/2\.\*\$..$}}
; CHECK-NEXT:{{^ \^$}}
Expand Down

0 comments on commit 251d078

Please sign in to comment.