dpkg-mergechangelogs: supplementary non-regression test

Add a test that ensures that dpkg-mergechangelogs deals correctly
with invalid versions.

Signed-off-by: Raphaël Hertzog <hertzog@debian.org>

scripts/t/910_merge_changelogs.t

@@ -22,7 +22,7 @@ use File::Temp qw(tempfile);
 use strict;
 use warnings;
 
-plan tests => 2;
+plan tests => 3;
 
 my $srcdir = $ENV{srcdir} || '.';
 my $datadir = "$srcdir/t/910_merge_changelogs";
@@ -32,7 +32,8 @@ sub test_merge {
     my ($expected_file, @options) = @_;
     my ($fh, $filename) = tempfile();
     spawn(exec => ["$srcdir/dpkg-mergechangelogs.pl", @options],
-	  to_handle => $fh, wait_child => 1, nocheck => 1);
+	  to_handle => $fh, error_to_file => "/dev/null",
+	  wait_child => 1, nocheck => 1);
     my $res = compare($expected_file, $filename);
     if ($res) {
 	system("diff -u $expected_file $filename >&2");
@@ -55,3 +56,5 @@ if ($has_alg_merge) {
     test_merge("$datadir/ch-merged-basic", @input);
     test_merge("$datadir/ch-merged-pr-basic", "-m", @input);
 }
+test_merge("$datadir/ch-badver-merged",  ("$datadir/ch-badver-old",
+    "$datadir/ch-badver-a", "$datadir/ch-badver-b"));

scripts/t/910_merge_changelogs/ch-badver-a

@@ -0,0 +1,5 @@
+egcs (ss-970814-1) experimental; urgency=low
+
+  * Initial packaging (of initial snapshot!)
+
+ -- Galen Hazelwood <galenh@micron.net>  Wed, 20 Aug 1997 00:36:28 +0000

scripts/t/910_merge_changelogs/ch-badver-b

@@ -0,0 +1,11 @@
+egcs (970904-1) experimental; urgency=low
+
+  * New upstream snapshot
+
+ -- Galen Hazelwood <galenh@micron.net>  Sun,  7 Sep 1997 18:25:06 -0600
+
+egcs (ss-970814-1) experimental; urgency=low
+
+  * Initial packaging (of initial snapshot!)
+
+ -- Galen Hazelwood <galenh@micron.net>  Wed, 20 Aug 1997 00:36:28 +0000

scripts/t/910_merge_changelogs/ch-badver-merged

@@ -0,0 +1,11 @@
+egcs (970904-1) experimental; urgency=low
+
+  * New upstream snapshot
+
+ -- Galen Hazelwood <galenh@micron.net>  Sun,  7 Sep 1997 18:25:06 -0600
+
+egcs (ss-970814-1) experimental; urgency=low
+
+  * Initial packaging (of initial snapshot!)
+
+ -- Galen Hazelwood <galenh@micron.net>  Wed, 20 Aug 1997 00:36:28 +0000

scripts/t/910_merge_changelogs/ch-badver-old

@@ -0,0 +1,5 @@
+egcs (ss-970814-1) experimental; urgency=low
+
+  * Initial packaging (of initial snapshot!)
+
+ -- Galen Hazelwood <galenh@micron.net>  Wed, 20 Aug 1997 00:36:28 +0000