Skip to content
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

Process raw TAP output from STDIN #83

Open
wants to merge 5 commits into
base: master
Choose a base branch
from
Open

Process raw TAP output from STDIN #83

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
05d7f42
Process raw TAP output from STDIN
timgimyee Oct 28, 2018
8302f9b
Check for `ok` and `not ok` test lines as well as `1..N` plan line
timgimyee Oct 29, 2018
2dd1146
Check for TAP version line, comments, and subtests
timgimyee Oct 29, 2018
a2047d2
Match plan line with more than 9 tests
timgimyee Oct 30, 2018
6c5cef4
Add --stdin=list|tap to explicitly set STDIN to list of tests or raw …
timgimyee Oct 30, 2018
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
19 changes: 18 additions & 1 deletion lib/App/Prove/State.pm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -390,7 +390,24 @@ sub _get_raw_tests {
if ( '-' eq $arg ) {
local $/;
my $in = <STDIN>;
if ($in =~ /^(?:1\.\.\d|ok|not ok)\b(?!\S)/m) {
if ($in =~ /
\A # Beginning of first line
TAP\s+version\s+\d+ # TAP version line
|
^ # Beginning of any line
\s* # Indented subtests
(?:
[#] # A comment
|
(?:
1\.\.\d | # A plan line
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think that should be \d+, otherwise it would fail to match 1..10

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Code is only as good as tests. Good catch.

ok | # A test line - pass
not\s+ok # A test line - fail
)
\b # End of word or number
(?!\S) # Space if anything else on line
)
/xm) {
# Raw TAP output.
push @tests => [$in, '*STDIN'];
} else {
Expand Down
66 changes: 40 additions & 26 deletions t/prove.t
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1475,8 +1475,9 @@ BEGIN { # START PLAN
]
],
},
{ name => 'STDIN (raw TAP - plan)',
stdin => "\n1..4 # Skipped: Win32 not supported\n",
(map +{
name => "STDIN (file - $_)",
stdin => "$_\ndos\ntres\n",
args => {
argv => ['-'],
},
Expand All @@ -1486,27 +1487,23 @@ BEGIN { # START PLAN
runlog => [
[ '_runtests',
{ verbosity => 0, show_count => 1 },
["\n1..4 # Skipped: Win32 not supported\n", '*STDIN'],
$_, 'dos', 'tres',
]
],
},
{ name => 'STDIN (raw TAP - ok)',
stdin => "\nok 1\n",
args => {
argv => ['-'],
},
expect => {
argv => ['-'],
},
runlog => [
[ '_runtests',
{ verbosity => 0, show_count => 1 },
["\nok 1\n", '*STDIN'],
]
],
},
{ name => 'STDIN (raw TAP - not ok)',
stdin => "\nnot ok\n",
} => split /\n/, <<'FILES'
1..2.t
1..2a
ok.t
okay
OK
not ok.t
not oklahoma
NOT OK
FILES
),
(map +{
name => "STDIN (TAP - $_)",
stdin => "\n$_\n",
args => {
argv => ['-'],
},
Expand All @@ -1516,12 +1513,29 @@ BEGIN { # START PLAN
runlog => [
[ '_runtests',
{ verbosity => 0, show_count => 1 },
["\nnot ok\n", '*STDIN'],
["\n$_\n", '*STDIN'],
]
],
},
{ name => 'STDIN (weird file names)',
stdin => "1..2.t\nok.t\nnot ok.t\n",
} => split /\n/, <<'TAP'
1..4
1..4 # Skipped: Win32 not supported
ok
ok 2
not ok
not ok 3
# comment
1..4
1..4 # Skipped: Win32 not supported
ok
ok 2
not ok
not ok 3
# comment
TAP
),
{
name => "STDIN (TAP - TAP version 13)",
stdin => "TAP version 13\n",
args => {
argv => ['-'],
},
Expand All @@ -1531,7 +1545,7 @@ BEGIN { # START PLAN
runlog => [
[ '_runtests',
{ verbosity => 0, show_count => 1 },
'1..2.t', 'ok.t', 'not ok.t'
["TAP version 13\n", '*STDIN'],
]
],
},
Expand Down