diff options
Diffstat (limited to 'debian/tests/debian-testing')
| -rwxr-xr-x | debian/tests/debian-testing | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/debian/tests/debian-testing b/debian/tests/debian-testing index 3f8e81a..1520cb4 100755 --- a/debian/tests/debian-testing +++ b/debian/tests/debian-testing @@ -35,10 +35,13 @@ sub capture { sub check_fake_schroot { my %params = @_; my $reference = $params{reference}; + my $version = $params{version} || '1.6.10-3'; my $extra_argv = $params{extra_argv} || []; + # Use unshare -m to make sure the /dev mount gets cleaned up on exit, even + # on failures my $response = capture([qw(unshare -m), - "$srcdir/debian/tests/fake/schroot-1.6.10-3", @{$extra_argv}, + "$srcdir/debian/tests/fake/schroot-$version", @{$extra_argv}, $params{chroot}, qw(runuser -u nobody --), qw(script -q -c), 'cat /etc/debian_version', '/dev/null']); @@ -49,9 +52,10 @@ sub check_fake_schroot { sub check_fake_pbuilder { my %params = @_; my $reference = $params{reference}; + my $version = $params{version} || '0.228.4-1'; my $response = capture([qw(unshare -m), - "$srcdir/debian/tests/fake/pbuilder-0.228.4-1", $params{chroot}, + "$srcdir/debian/tests/fake/pbuilder-$version", $params{chroot}, qw(runuser -u nobody --), qw(script -q -c), 'cat /etc/debian_version', '/dev/null']); $response =~ s/\r//g; @@ -108,8 +112,6 @@ sub check_chroot { cat /etc/debian_version)]), $reference); - # Use unshare -m to make sure the /dev mount gets cleaned up on exit, even - # on failures check_fake_schroot(%params, reference => $reference); # https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=817236 @@ -135,6 +137,9 @@ sub check_chroot { extra_argv => ['--sbuild']); } + check_fake_pbuilder(%params, reference => $reference, + version => 'proposed'); + # https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=817236 if (! $params{can_mknod_ptmx}) { TODO: { |