Use latest NiHTest.
diff --git a/regress/NiHTest.pm b/regress/NiHTest.pm
index 842e183..688ec18 100644
--- a/regress/NiHTest.pm
+++ b/regress/NiHTest.pm
@@ -143,7 +143,7 @@
$self->{default_program} = $opts->{default_program};
$self->{zipcmp} = $opts->{zipcmp} // 'zipcmp';
- $self->{zipcmp_flags} = $opts->{zipcmp_flags};
+ $self->{zipcmp_flags} = $opts->{zipcmp_flags} // '-p';
$self->{directives} = {
args => { type => 'string...', once => 1, required => 1 },
@@ -169,8 +169,6 @@
$self->{copy_by_type} = {};
$self->{hooks} = {};
- $self->add_comparator('zip/zip', \&comparator_zip);
-
$self->get_variable('srcdir', $opts);
$self->get_variable('top_builddir', $opts);
@@ -358,7 +356,7 @@
@ARGV = @argv;
my $ok = GetOptions(
'help|h' => \my $help,
- 'keep-broken' => \$self->{keep_broken},
+ 'keep-broken|k' => \$self->{keep_broken},
'no-cleanup' => \$self->{no_cleanup},
# 'run-gdb' => \$self->{run_gdb},
'setup-only' => \$self->{setup_only},
@@ -446,7 +444,7 @@
sub comparator_zip {
my ($self, $got, $expected) = @_;
- my @args = ($self->{zipcmp}, $self->{verbose} ? '-pv' : '-pq');
+ my @args = ($self->{zipcmp}, $self->{verbose} ? '-v' : '-q');
push @args, $self->{zipcmp_flags} if ($self->{zipcmp_flags});
push @args, ($expected, $got);
diff --git a/regress/runtest.in b/regress/runtest.in
index 2e8afe5..7890410 100644
--- a/regress/runtest.in
+++ b/regress/runtest.in
@@ -40,4 +40,6 @@
my $test = NiHTest::new({ default_program => '../src/ziptool', srcdir => '@srcdir@', top_builddir => '@top_builddir@', zipcmp => '../../src/zipcmp', zipcmp_flags => '-p' });
+$test->add_comparator('zip/zip', \&NiHTest::comparator_zip);
+
$test->run(@ARGV);
