[libtest-mojibake-perl] 03/04: Use the installed scripts in t/00-compile during autopkgtest

[Carnë Draug]

This is an automated email from the git hooks/post-receive script.

carandraug-guest pushed a commit to branch master
in repository libtest-mojibake-perl.

commit 3352714cd787f09a115d1a5a0a72af66de4ff70d
Author: Carnë Draug <carandraug+dev at gmail.com>
Date:   Fri Jan 27 17:28:16 2017 +0000

    Use the installed scripts in t/00-compile during autopkgtest
---
 debian/changelog                         |  9 ---------
 debian/patches/autopkgtest-compile.patch | 19 +++++++++++++++++++
 debian/patches/series                    |  1 +
 debian/tests/pkg-perl/smoke-files        |  2 --
 4 files changed, 20 insertions(+), 11 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 307e5b7..19012a4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,14 +1,5 @@
 libtest-mojibake-perl (1.1-1) UNRELEASED; urgency=low
 
-  TODO:
-  - autopkgtest: adding the script to debian/tests/pkg-perl/smoke-files of
-    course works. it has the slight disadvantage that it then tests the script
-    from the source tree and not the installed one at /usr/bin/scan_mojibake.
-    this is not really a problem for the trivial case here with
-    t/00-compile.t; an alternative is to patch the tests(s) to look in the
-    right place when run under autopkgtest. cf. e.g.
-    libpod-spell-perl/debian/patches/autopkgtest.patch
-
   * Initial Release. (Closes: #852797)
 
  -- Carnë Draug <carandraug+dev at gmail.com>  Fri, 27 Jan 2017 13:04:01 +0000
diff --git a/debian/patches/autopkgtest-compile.patch b/debian/patches/autopkgtest-compile.patch
new file mode 100644
index 0000000..ac85baa
--- /dev/null
+++ b/debian/patches/autopkgtest-compile.patch
@@ -0,0 +1,19 @@
+Description: Use the installed scripts in t/00-compile during autopkgtest
+Author: Carnë Draug <carandraug+dev at gmail.com>
+Last-Update: Fri 27 Jan 17:24:31 GMT 2017
+
+Index: libtest-mojibake-perl/t/00-compile.t
+===================================================================
+--- libtest-mojibake-perl.orig/t/00-compile.t
++++ libtest-mojibake-perl/t/00-compile.t
+@@ -12,8 +12,9 @@ my @module_files = (
+     'Test/Mojibake.pm'
+ );
+ 
++my $bindir = $ENV{ADTTMP} ? '/usr/bin' : 'bin';
+ my @scripts = (
+-    'bin/scan_mojibake'
++    "$bindir/scan_mojibake"
+ );
+ 
+ # no fake home requested
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..cef75e8
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+autopkgtest-compile.patch
diff --git a/debian/tests/pkg-perl/smoke-files b/debian/tests/pkg-perl/smoke-files
deleted file mode 100644
index a8a8522..0000000
--- a/debian/tests/pkg-perl/smoke-files
+++ /dev/null
@@ -1,2 +0,0 @@
-bin/scan_mojibake
-t/

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-perl/packages/libtest-mojibake-perl.git