Felix Lechner · Chris Lamb · Felix Lechner · Chris Lamb · Felix Lechner · Chris Lamb
--- a/debian/changelog
+++ b/debian/changelog
@@ -15,6 +15,11 @@ lintian (2.5.117) UNRELEASED; urgency=medium
    + [CL] Correct grammar of the debian-watch-does-not-check-gpg-signature
      tag description.
  
+  * t/*:
+    + [CL] Apply a patch series from Felix Lechner to use "skeletons" as
+      test templates, fixing a "exec failed: Text file busy" regression
+      when running tests by tag name.  (Closes: #916087)
+
 -- Chris Lamb <lamby@debian.org>  Fri, 07 Dec 2018 10:41:09 +0100
  
 lintian (2.5.116) unstable; urgency=medium

--- a/t/defaults/desc
+++ b/t/defaults/desc
@@ -8,7 +8,6 @@ Package-Architecture: all
 Prev-Date: Mon, 01 Jan 1990 00:00:00 +0100
 Skeleton: default
 Builder: builder
-Post-Template-Command: post_template
 Sequence: 6000
 Profile: debian
 Options: -I -E

--- a/t/runtests
+++ b/t/runtests
@@ -441,19 +441,24 @@ sub generic_test_runner {
        }
    }

+    # load skeleton
+    if (exists $testdata->{skeleton}) {
+
        # the skeleton we are working with
        my $skeletonname = $testdata->{skeleton};
        my $skeletonpath = "$TESTSET/skeletons/$suite/$skeletonname";

        my $skeleton = read_config($skeletonpath);

+        foreach my $key (keys %{$skeleton}) {
+            $testdata->{$key} = $skeleton->{$key};
+        }
+    }
+
    if (   $ALWAYS_REBUILD
        or not up_to_date($stampfile, $testdir, $RUNNER_TS)
        or -e "$targetdir/debian/debian") {

-        my $skel = $testdata->{skeleton};
-        my $tmpldir = "$TESTSET/templates/$suite/";
-
        $test_state->info_msg(2, "Cleaning up and repopulating $targetdir...");
        runsystem_ok('rm', '-rf', $targetdir);

@@ -464,24 +469,9 @@ sub generic_test_runner {
        }

        # populate working directory with specified template sets
-        copy_skeleton_template_sets($skeleton->{template_sets},
+        copy_skeleton_template_sets($testdata->{template_sets},
            $targetdir, $TESTSET)
-          if exists $skeleton->{template_sets};
-
-        # get post-template command
-        my $posttemplatename = $testdata->{post_template_command};
-        if (length $posttemplatename) {
-            my $posttemplatepath = "$targetdir/$posttemplatename";
-
-            # fill if needed
-            my $posttemplatetemplate = "$posttemplatepath.in";
-            fill_template($posttemplatetemplate, $posttemplatepath, $testdata,
-                $RUNNER_TS)
-              if -f $posttemplatetemplate;
-
-            safe_qx($posttemplatepath, $targetdir)
-              if -x $posttemplatepath;
-        }
+          if exists $testdata->{template_sets};

        # delete templates for which we have originals
        remove_surplus_templates($testdir, $targetdir);
@@ -520,9 +510,9 @@ sub generic_test_runner {
    if ($ALWAYS_REBUILD or not up_to_date($stampfile, $testdir, $RUNNER_TS)) {

        # fill remaining templates
-        fill_skeleton_templates($skeleton->{fill_targets},
+        fill_skeleton_templates($testdata->{fill_targets},
            $testdata, $RUNNER_TS, $targetdir, $TESTSET)
-          if exists $skeleton->{fill_targets};
+          if exists $testdata->{fill_targets};
    }

    # get lintian subject

--- a/t/skeletons/tests/builder-only
+++ b/t/skeletons/tests/builder-only
+Type: non-native
 Template-Sets:
 . (tests-make-builder)
 Fill-Targets:

--- a/t/skeletons/tests/non-native
+++ b/t/skeletons/tests/non-native
+Type: non-native
+Template-Sets:
+ debian (tests-pedantic),
+ debian (tests-watchfile),
+ . (tests-make-builder)
+Fill-Targets:
+ debian (debian-packaging),
+ orig/debian (debian-packaging),
+ . (make-builder)
--- a/t/templates/tests-make-builder/post_template.in
+++ b/t/templates/tests-make-builder/post_template.in
-#!/bin/sh
-
-set -e
-
-DIR="$1"
-
-if [ "{$type}" = "native" ]; then
-	rm -f "$DIR/debian/watch.in"
-	rm -f "$DIR/debian/watch"
-fi
--- a/t/templates/tests-pedantic/watch
+++ b/t/templates/tests-pedantic/watch
--- a/t/tests/basic-non-native-with-epoch/desc
+++ b/t/tests/basic-non-native-with-epoch/desc
 Testname: basic-non-native-with-epoch
 Sequence: 0001
 Version: 1:1.0-1
-Type: non-native
+Skeleton: non-native
 Description: Basic test of a non-native package with epoch
--- a/t/tests/basic-non-native/desc
+++ b/t/tests/basic-non-native/desc
 Testname: basic-non-native
 Sequence: 0001
-Type: non-native
+Skeleton: non-native
 Version: 1.0-1
 Description: Basic test of a non-native package
--- a/t/tests/basic-quilt-updeb/desc
+++ b/t/tests/basic-quilt-updeb/desc
 Testname: basic-quilt-updeb
 Sequence: 0001
-Type: non-native
+Skeleton: non-native
 Version: 1.0-1
 Source-Format: 3.0 (quilt)
 Description: Basic test of a 3.0 (quilt) non-native package
--- a/t/tests/basic-quilt/desc
+++ b/t/tests/basic-quilt/desc
 Testname: basic-quilt
 Sequence: 0001
-Type: non-native
+Skeleton: non-native
 Version: 1.0-1
 Source-Format: 3.0 (quilt)
 Description: Basic test of a 3.0 (quilt) non-native package
--- a/t/tests/binaries-static-lib/desc
+++ b/t/tests/binaries-static-lib/desc
 Testname: binaries-static-lib
 Version: 1.0-1
 Package-Architecture: any
-Type: non-native
+Skeleton: non-native
 Description: Test checks related to static libs
 Test-For:
 static-library-has-unneeded-section

--- a/t/tests/changelog-file-consecutive-debian-revision-unrel/desc
+++ b/t/tests/changelog-file-consecutive-debian-revision-unrel/desc
 Testname: changelog-file-consecutive-debian-revision-unrel
-Type: non-native
+Skeleton: non-native
 Version: 1.0-1
 Description: Check for false positive in non-consecutive-debian-revision
 Options: --pedantic -I -E

--- a/t/tests/changelog-file-dch-wrong-name/desc
+++ b/t/tests/changelog-file-dch-wrong-name/desc
 Testname: changelog-file-dch-wrong-name
-Type: non-native
+Skeleton: non-native
 Version: 1.0-1
 Description: Test if Debian changelog has the wrong name
 Test-For: wrong-name-for-debian-changelog-file
--- a/t/tests/changelog-file-etch-nmu/desc
+++ b/t/tests/changelog-file-etch-nmu/desc
 Testname: changelog-file-etch-nmu
-Type: non-native
+Skeleton: non-native
 Version: 1.0-1etch1.1
 Description: Test for a code name in an unstable upload
 Test-Against:

--- a/t/tests/changelog-file-etch/desc
+++ b/t/tests/changelog-file-etch/desc
 Testname: changelog-file-etch
-Type: non-native
+Skeleton: non-native
 Version: 1.0-1etch1
 Description: Test for a code name in an unstable upload
 Test-Against:

--- a/t/tests/changelog-file-extra-upstream/desc
+++ b/t/tests/changelog-file-extra-upstream/desc
 Testname: changelog-file-extra-upstream
-Type: non-native
+Skeleton: non-native
 Version: 1.0-1
 Description: Check a package with ChangeLog and changelog.gz
 Test-Against: changelog-file-not-compressed
--- a/t/tests/changelog-file-general/desc
+++ b/t/tests/changelog-file-general/desc
 Testname: changelog-file-general
-Type: non-native
+Skeleton: non-native
 Version: 1.0-1
 Description: General tests for changelog-file tags
 Test-Against:

--- a/t/tests/changelog-file-line-too-short/desc
+++ b/t/tests/changelog-file-line-too-short/desc
 Testname: changelog-file-line-too-short
-Type: non-native
+Skeleton: non-native
 Options: --pedantic
 Version: 1.0-1
 Description: Test for short changelog entries

--- a/t/tests/changelog-file-missing/desc
+++ b/t/tests/changelog-file-missing/desc
 Testname: changelog-file-missing
-Type: non-native
+Skeleton: non-native
 Version: 1.0-1
 Description: Test if Debian changelog is missing
 Test-For: