github-repos/wget
1
0
Fork 0
mirror of https://github.com/mirror/wget.git synced 2025-04-24 12:10:16 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix WgetFeature.pm to allow multiple required features

Browse Source 
* tests/WgetFeature.cfg: Remove file
* tests/WgetFeature.pm: Extend to multiple features, cleanup
This commit is contained in:
Tim Rühsen 2017-05-09 11:03:38 +02:00
parent 9aa894853f
commit ffe75d0867
3 changed files with 15 additions and 24 deletions

2
tests/Makefile.am
View File

@ -140,7 +140,7 @@ PX_TESTS = \
EXTRA_DIST = FTPServer.pm FTPTest.pm HTTPServer.pm HTTPTest.pm \
SSLTest.pm SSLServer.pm \
WgetTests.pm WgetFeature.pm WgetFeature.cfg $(PX_TESTS) \
WgetTests.pm WgetFeature.pm $(PX_TESTS) \
certs valgrind-suppressions valgrind-suppressions-ssl
check_PROGRAMS = unit-tests

6
tests/WgetFeature.cfg
View File

@ -1,6 +0,0 @@
%skip_messages = (
https => "Not running test: Wget under test doesn't support HTTPS.",
iri => "Not running test: Wget under test doesn't support IDN/IRI.",
);
1;

31
tests/WgetFeature.pm
View File

@ -5,26 +5,14 @@ use warnings;
our $VERSION = 0.01;
use Carp;
use English qw(-no_match_vars);
use FindBin;
use WgetTests;
our %SKIP_MESSAGES;
{
my $cfgfile = "$FindBin::Bin/WgetFeature.cfg";
open my $fh, '<', $cfgfile
or croak "Cannot open '$cfgfile': $ERRNO";
my @lines = <$fh>;
close $fh or carp "Cannot close '$cfgfile': $ERRNO";
my $evalstr = join q{}, @lines;
eval { $evalstr } or carp "Cannot eval '$cfgfile': $ERRNO";
}
sub import
{
my ($class, $feature) = @_;
my ($class, @required_feature) = @_;
# create a list of available features from 'wget --version' output
my $output = `$WgetTest::WGETPATH --version`;
my ($list) = $output =~ m/^([+-]\S+(?:\s+[+-]\S+)+)/msx;
my %have_features;
@ -34,10 +22,19 @@ sub import
$feat =~ s/^.//msx;
$have_features{$feat} = $f =~ m/^[+]/msx ? 1 : 0;
}
if (!$have_features{$feature})
foreach (@required_feature)
{
print "$SKIP_MESSAGES{$feature}\n";
exit 77; # skip
if (!$have_features{$_})
{
print "Skipped test: Wget misses feature '$_'\n";
print "Features available from 'wget --version' output:\n";
foreach (keys %have_features)
{
print " $_=$have_features{$_}\n";
}
exit 77; # skip
}
}
}