diff options
| author | Guillem Jover <guillem@debian.org> | 2017-01-29 20:28:15 +0100 |
|---|---|---|
| committer | Guillem Jover <guillem@debian.org> | 2017-01-29 20:28:15 +0100 |
| commit | d5a9cf8b9dcfbb717c7748e1ffd2e287e12b035d (patch) | |
| tree | b1269c93865fc80132351055562de28a9639961f /scripts/t | |
| parent | ca30a8d1dbbf5f978242b90d4f690116ae7004a9 (diff) | |
| download | dpkg-d5a9cf8b9dcfbb717c7748e1ffd2e287e12b035d.tar.gz | |
Revert "dpkg-source: Generate Testsuite-Restrictions fields from test restrictions"
This reverts commit 9899bdcf9bde76d969b124abf0a898fcbb202c70.
This change is contentious and should have been discussed more widely.
Given that this has been live only for a couple of days, the impact
should be minimal, but still something to take into account once and
if this gets reintroduced, in the same or different form and shape.
Closes: #852820
Diffstat (limited to 'scripts/t')
| -rw-r--r-- | scripts/t/dpkg_source.t | 16 | ||||
| -rw-r--r-- | scripts/t/dpkg_source/testsuite_4.dsc | 17 |
2 files changed, 1 insertions, 32 deletions
diff --git a/scripts/t/dpkg_source.t b/scripts/t/dpkg_source.t index 317e445f0..2de0c0dbb 100644 --- a/scripts/t/dpkg_source.t +++ b/scripts/t/dpkg_source.t @@ -16,7 +16,7 @@ use strict; use warnings; -use Test::More tests => 10; +use Test::More tests => 8; use Test::Dpkg qw(test_neutralize_checksums); use File::Spec::Functions qw(rel2abs); @@ -64,20 +64,12 @@ Architecture: all Description: test package TMPL_CONTROL -my $tmpl_tests_control = <<'TMPL_TESTS_CONTROL'; -Test-Command: ${test-command} -Depends: ${test-depends} -Restrictions: ${test-restrictions} -TMPL_TESTS_CONTROL - my %default_substvars = ( 'source-name' => 'test-source', 'source-version' => 0, 'source-section' => 'test', 'source-priority' => 'optional', 'source-testsuite' => 'autopkgtest', - 'test-command' => 'true', - 'test-depends' => '@', 'suite' => 'unstable', 'urgency' => 'low', 'maintainer' => 'Dpkg Developers <debian-dpkg@lists.debian.org>', @@ -176,10 +168,4 @@ $dirname = gen_source('source-name' => 'testsuite', 'source-version' => 3); test_build_source($dirname); -$dirname = gen_source('source-name' => 'testsuite', - 'source-version' => 4, - 'test-restrictions' => 'needs-root,build-needed allow-stderr', - 'control-test' => $tmpl_tests_control); -test_build_source($dirname); - 1; diff --git a/scripts/t/dpkg_source/testsuite_4.dsc b/scripts/t/dpkg_source/testsuite_4.dsc deleted file mode 100644 index 197cdbc76..000000000 --- a/scripts/t/dpkg_source/testsuite_4.dsc +++ /dev/null @@ -1,17 +0,0 @@ -Format: 3.0 (native) -Source: testsuite -Binary: test-binary -Architecture: all -Version: 4 -Maintainer: Dpkg Developers <debian-dpkg@lists.debian.org> -Standards-Version: 1.0 -Testsuite: autopkgtest -Testsuite-Restrictions: allow-stderr, build-needed, needs-root -Package-List: - test-binary deb test optional arch=all -Checksums-Sha1: - 0000000000000000000000000000000000000000 0 testsuite_4.tar.xz -Checksums-Sha256: - 0000000000000000000000000000000000000000000000000000000000000000 0 testsuite_4.tar.xz -Files: - 00000000000000000000000000000000 0 testsuite_4.tar.xz |