github.com/openresty
1
0
Fork 0
mirror of https://github.com/openresty/openresty synced 2024-11-09 18:35:51 +01:00
Code Releases Wiki Activity

tests: added support for --- out_like blocks.

Browse Source
This commit is contained in:
Thibault Charbonnier 2019-02-04 16:12:54 -08:00 committed by Thibault Charbonnier
parent 72962e0125
commit 73c881bddf
1 changed files with 19 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
t/Config.pm
View File

@ -58,11 +58,19 @@ sub run_test ($) {
$expected_err =~ s/\$OPENRESTY_DIR\b/$DistRoot/gs;
}
my $expected_out = $block->out;
if (!defined $expected_out) {
$expected_out = '';
my ($expected_out, $expected_out_regex);
if (defined $block->out_like) {
$expected_out_regex = $block->out_like;
if (!ref $expected_out_regex) {
$expected_out_regex = qr~$expected_out_regex~s;
}
} elsif (defined $block->out) {
$expected_out = $block->out;
} else {
#$expected_out =~ s/\$OPENRESTY_BUILD_DIR\b/$BuildRoot/gs;
$expected_out = '';
}
#die $BuildRoot;
@ -70,7 +78,13 @@ sub run_test ($) {
$stdout =~ s/\Q$BuildRoot\E/\$OPENRESTY_BUILD_DIR/g;
$stdout =~ s/\Q$DistRoot\E/\$OPENRESTY_DIR/g;
is($stdout, $expected_out, "$name - stdout ok");
if (ref $expected_out_regex) {
like $stdout, $expected_out_regex, "$name - stdout like ok";
} else {
is $stdout, $expected_out, "$name - stdout ok";
}
is($stderr, $expected_err, "$name - stderr ok");
is($retval >> 8, $expected_exit, "$name - exit code ok");