shaba/systemd-stable
1
1
Fork 0
mirror of https://github.com/systemd/systemd-stable.git synced 2025-02-26 09:57:26 +03:00
Code

test/udev_test.pl: add "expected good" count

Browse Source 
Since 'test/udev-test.pl: count "good" results', we know how many
checks succeeded. Add an "expected good" count to make that number
more meaningful.
This commit is contained in:
Martin Wilck 2018-04-26 14:07:27 +02:00 committed by Michal Sekletár
parent f1cb086054
commit cbeb23d863
1 changed files with 19 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
test/udev-test.pl
View File

@ -2338,6 +2338,7 @@ sub udev {
my $error = 0; my $error = 0;
my $good = 0; my $good = 0;
my $exp_good = 0;
sub permissions_test { sub permissions_test {
my($rules, $uid, $gid, $mode) = @_; my($rules, $uid, $gid, $mode) = @_;
@ -2685,12 +2686,27 @@ sub run_test {
my ($rules, $number, $sema) = @_; my ($rules, $number, $sema) = @_;
my $rc; my $rc;
my @devices; my @devices;
my $ntests;
my $cur_good = $good;
my $cur_error = $error;
if (!defined $rules->{devices}) { if (!defined $rules->{devices}) {
$rules->{devices} = all_block_devs($rules->{generator}); $rules->{devices} = all_block_devs($rules->{generator});
} }
@devices = @{$rules->{devices}}; @devices = @{$rules->{devices}};
# For each device: exit status and devnode test for add & remove
$ntests += 4 * ($#devices + 1);
foreach my $dev (@devices) {
$ntests += 2 * ($#{$dev->{exp_links}} + 1)
+ ($#{$dev->{not_exp_links}} + 1)
+ (defined $dev->{exp_perms} ? 1 : 0)
+ (defined $dev->{exp_majorminor} ? 1 : 0);
}
if (defined $rules->{repeat}) {
$ntests *= $rules->{repeat};
}
$exp_good += $ntests;
print "TEST $number: $rules->{desc}\n"; print "TEST $number: $rules->{desc}\n";
create_rules(\$rules->{rules}); create_rules(\$rules->{rules});
@ -2712,10 +2728,11 @@ sub run_test {
check_remove($dev); check_remove($dev);
} }
print "\n";
if (defined($rules->{repeat}) && --($rules->{repeat}) > 0) { if (defined($rules->{repeat}) && --($rules->{repeat}) > 0) {
goto REPEAT; goto REPEAT;
} }
printf "TEST $number: errors: %d good: %d/%d\n\n", $error-$cur_error,
$good-$cur_good, $ntests;
if (defined($rules->{option}) && $rules->{option} eq "clean") { if (defined($rules->{option}) && $rules->{option} eq "clean") {
udev_setup(); udev_setup();
@ -2794,7 +2811,7 @@ if ($list[0]) {
} }
$sema->remove; $sema->remove;
print "$error errors occurred. $good good results.\n\n"; print "$error errors occurred. $good/$exp_good good results.\n\n";
cleanup(); cleanup();