[devscripts] 05/06: Actually parse --directory, and test it

[Joachim Breitner]

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

nomeata pushed a commit to branch mk-origtargz
in repository devscripts.

commit ab9ecc7777d4530cf814267dbac6aaf2808564ac
Author: Joachim Breitner <nomeata at debian.org>
Date:   Sun Apr 13 01:20:16 2014 +0200

    Actually parse --directory, and test it
---
 scripts/mk-origtargz.pl | 21 +++++++++++----------
 test/test_mk-origtargz  | 12 ++++++++++++
 2 files changed, 23 insertions(+), 10 deletions(-)

diff --git a/scripts/mk-origtargz.pl b/scripts/mk-origtargz.pl
index 931f31a..5fdb066 100755
--- a/scripts/mk-origtargz.pl
+++ b/scripts/mk-origtargz.pl
@@ -200,16 +200,17 @@ sub setmode {
 }
 
 GetOptions(
-        "package=s" => \$package,
-        "version|v=s" => \$version,
-        "exclude-file=s" => \@exclude_globs,
-        "compression=s" => \$compression,
-        "symlink" => \&setmode,
-        "rename" => \&setmode,
-        "copy" => \&setmode,
-        "repack" => \$repack,
-        "help|h" => sub { pod2usage({-exitval => 0, -verbose => 1}); },
-) or pod2usage({-exitval => 3});
+	"package=s" => \$package,
+	"version|v=s" => \$version,
+	"exclude-file=s" => \@exclude_globs,
+	"compression=s" => \$compression,
+	"symlink" => \&setmode,
+	"rename" => \&setmode,
+	"copy" => \&setmode,
+	"repack" => \$repack,
+	"directory|C=s" => \$destdir,
+	"help|h" => sub { pod2usage({-exitval => 0, -verbose => 1}); },
+) or pod2usage({-exitval => 3, -verbose=>1});
 
 $mode ||= "symlink";
 
diff --git a/test/test_mk-origtargz b/test/test_mk-origtargz
index 06e5df9..9e161c8 100755
--- a/test/test_mk-origtargz
+++ b/test/test_mk-origtargz
@@ -148,6 +148,18 @@ testRenameExplicit() {
 	assertTrue "result is not readable" "[ -r $TMPDIR/foo_0.1.orig.tar.gz ]"
 }
 
+testSymlinkExplicitSubidr() {
+	TMPDIR=$(mktemp -d)
+	makeTarBall gz
+	mkdir -p $TMPDIR/destdir
+	( cd $TMPDIR ; $MK_ORIGTARGZ --package foo --version 0.1 -C destdir foo-0.1.tar.gz )
+	assertTrue "original tarball does not exist" "[ -e $TMPDIR/foo-0.1.tar.gz ]"
+	assertTrue "result does not exist" "[ -e $TMPDIR/destdir/foo_0.1.orig.tar.gz ]"
+	assertTrue "result is not a symlink" "[ -L $TMPDIR/destdir/foo_0.1.orig.tar.gz ]"
+	assertTrue "result is not readable" "[ -r $TMPDIR/destdir/foo_0.1.orig.tar.gz ]"
+	assertEquals "final symlink" ../foo-0.1.tar.gz "$(readlink $TMPDIR/destdir/foo_0.1.orig.tar.gz)"
+}
+
 
 
 

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/collab-maint/devscripts.git