Skip to content

docs: move examples to be run together with integration tests #87

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
stanislaw merged 1 commit into from
Jan 25, 2020
Merged

docs: move examples to be run together with integration tests #87

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 0 additions & 2 deletions examples/check-commands/CHECK-NEXT.check
View file
Open in desktop

This file was deleted.

2 changes: 0 additions & 2 deletions examples/lit.cfg
View file
Open in desktop

This file was deleted.

4 changes: 2 additions & 2 deletions tests/integration/lit.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,6 @@ config.substitutions.append(('%COMPARE_EXEC', "{}/tests/integration/tools/compar
config.substitutions.append(('%FILECHECK_TESTER_EXEC', "{}/tests/integration/tools/FileCheck/FileCheck".format(current_dir)))

if real_only:
config.suffixes = ['.itest']
config.suffixes = ['.itest', '.c']
else:
config.suffixes = ['.itest', '.py-itest']
config.suffixes = ['.itest', '.c', '.py-itest']
0 examples/check-commands/CHECK.check → ...0-scanning-from-here-location/CHECK.check
View file
Open in desktop
File renamed without changes.
10 changes: 10 additions & 0 deletions ...integration/tests/check_commands/CHECK/failure/10-scanning-from-here-location/CHECK.itest
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
; RUN: echo -e "String1" | (%FILECHECK_EXEC %S/CHECK.check 2>&1; test $? = 1;) | %FILECHECK_EXEC %s
; CHECK: {{^.*}}FileCheck{{(\.py)?$}}
; CHECK: {{.*}}CHECK.check:2:8: error: CHECK: expected string not found in input
; CHECK: CHECK: String2
; CHECK: ^
; TODO
; CHECK <stdin>:1:8: note: scanning from here
; CHECK String1
; CHECK: ^
; CHECK-EMPTY:
2 changes: 2 additions & 0 deletions tests/integration/tests/examples/check-commands/CHECK-NEXT/Failure/CHECK-NEXT.check
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
CHECK: String1
CHECK-NEXT: String2
15 changes: 15 additions & 0 deletions tests/integration/tests/examples/check-commands/CHECK-NEXT/Failure/CHECK-NEXT.itest
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
; RUN: echo -e "String1\nfoo\nString2" | (%FILECHECK_EXEC %S/CHECK-NEXT.check 2>&1; test $? = 1;) | %FILECHECK_EXEC %s

; CHECK: {{.*}}CHECK-NEXT.check:2:13: error: CHECK-NEXT: is not on the line after the previous match
; CHECK: CHECK-NEXT: String2
; CHECK: ^
; CHECK: <stdin>:3:1: note: 'next' match was here
; CHECK: String2
; CHECK: ^
; CHECK: <stdin>:1:8: note: previous match ended here
; CHECK: String1
; CHECK: ^
; CHECK: <stdin>:2:1: note: non-matching line after previous match is here
; CHECK: foo
; CHECK: ^
; CHECK-EMPTY:
2 changes: 2 additions & 0 deletions tests/integration/tests/examples/check-commands/CHECK-NEXT/Success/CHECK-NEXT.check
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
CHECK: String1
CHECK-NEXT: String2
3 changes: 3 additions & 0 deletions tests/integration/tests/examples/check-commands/CHECK-NEXT/Success/CHECK-NEXT.itest
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
; RUN: echo -e "String1\nString2" | %FILECHECK_EXEC %S/CHECK-NEXT.check | %FILECHECK_EXEC %s
; CHECK: {{^.*}}FileCheck{{(\.py)?$}}
; CHECK-EMPTY:
1 change: 0 additions & 1 deletion examples/check-commands/CHECK-NOT.check → ...ommands/CHECK-NOT/Failure/CHECK-NOT.check
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
CHECK-NOT: String1
CHECK-NOT: String2
CHECK-NOT: String3

8 changes: 8 additions & 0 deletions tests/integration/tests/examples/check-commands/CHECK-NOT/Failure/CHECK-NOT.itest
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
; RUN: echo -e "String3" | (%FILECHECK_EXEC %S/CHECK-NOT.check 2>&1; test $? = 1;) | %FILECHECK_EXEC %s
; CHECK: {{.*}}CHECK-NOT.check:3:12: error: CHECK-NOT: excluded string found in input
; CHECK: CHECK-NOT: String3
; CHECK: ^
; CHECK: <stdin>:1:1: note: found here
; CHECK: String3
; CHECK: ^~~~~~~
; CHECK-EMPTY:
3 changes: 3 additions & 0 deletions tests/integration/tests/examples/check-commands/CHECK-NOT/Success/CHECK-NOT.check
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
CHECK-NOT: String1
CHECK-NOT: String2
CHECK-NOT: String3
3 changes: 3 additions & 0 deletions tests/integration/tests/examples/check-commands/CHECK-NOT/Success/CHECK-NOT.itest
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
; RUN: echo -e "String4" | %FILECHECK_EXEC %S/CHECK-NOT.check | %FILECHECK_EXEC %s
; CHECK: {{^.*}}FileCheck{{(\.py)?$}}
; CHECK-EMPTY:
3 changes: 3 additions & 0 deletions tests/integration/tests/examples/check-commands/CHECK/Failure/CHECK.check
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
CHECK: String1
CHECK: String2
CHECK: String3
11 changes: 11 additions & 0 deletions tests/integration/tests/examples/check-commands/CHECK/Failure/CHECK.itest
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
; RUN: echo -e "String1" | (%FILECHECK_EXEC %S/CHECK.check 2>&1; test $? = 1;) | %FILECHECK_EXEC %s
; CHECK: {{^.*}}FileCheck{{(\.py)?$}}
; CHECK: {{.*}}CHECK.check:2:8: error: CHECK: expected string not found in input
; CHECK: CHECK: String2
; CHECK: ^
; TODO
; CHECK <stdin>:1:8: note: scanning from here
; TODO
; CHECK String1
; CHECK: ^
; CHECK-EMPTY:
3 changes: 3 additions & 0 deletions tests/integration/tests/examples/check-commands/CHECK/Success/CHECK.check
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
CHECK: String1
CHECK: String2
CHECK: String3
3 changes: 3 additions & 0 deletions tests/integration/tests/examples/check-commands/CHECK/Success/CHECK.itest
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
; RUN: echo -e "String1\nString2\nString3" | %FILECHECK_EXEC %S/CHECK.check | %FILECHECK_EXEC %s
; CHECK: {{^.*}}FileCheck{{(\.py)?$}}
; CHECK-EMPTY:
0 examples/hello-world/hello-world-regex.check → ...mples/hello-world/hello-world-regex.check
View file
Open in desktop
File renamed without changes.
0 examples/hello-world/hello-world.check → ...ts/examples/hello-world/hello-world.check
View file
Open in desktop
File renamed without changes.
0 examples/hello-world/order-of-matching.check → ...mples/hello-world/order-of-matching.check
View file
Open in desktop
File renamed without changes.
0 examples/lit-and-filecheck/.gitignore → ...sts/examples/lit-and-filecheck/.gitignore
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion examples/lit-and-filecheck/01-pass.c → ...ests/examples/lit-and-filecheck/01-pass.c
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/**
; RUN: clang %s -o %S/hello-world && %S/hello-world | filecheck %s
; RUN: gcc %s -o %S/hello-world && %S/hello-world | filecheck %s
; CHECK: Hello world
*/

Expand Down
2 changes: 1 addition & 1 deletion examples/lit-and-filecheck/02-fail.c → ...ests/examples/lit-and-filecheck/02-fail.c
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/**
; RUN: clang %s -o %S/hello-world && %S/hello-world | filecheck %s
; RUN: gcc %s -o %S/hello-world && %S/hello-world | filecheck %s; test $? = 1
; CHECK: Wrong line
*/

Expand Down
0 examples/lit-and-filecheck/minimal.itest → .../examples/lit-and-filecheck/minimal.itest
View file
Open in desktop
File renamed without changes.