summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorespie <espie@openbsd.org>2019-05-09 20:26:33 +0000
committerespie <espie@openbsd.org>2019-05-09 20:26:33 +0000
commite6e074149ba1b46b0092a8757d056b1478a90916 (patch)
treed9c8d85ad052d71ab751e635212a1b583057fbe5
parentrm lists of hereditary wizards and bad users to ensure level playing field (diff)
downloadwireguard-openbsd-e6e074149ba1b46b0092a8757d056b1478a90916.tar.xz
wireguard-openbsd-e6e074149ba1b46b0092a8757d056b1478a90916.zip
compare now wants a state object, so make it.
noticed by bluhm@
-rwxr-xr-xregress/usr.sbin/pkg_add/check-sig27
1 files changed, 15 insertions, 12 deletions
diff --git a/regress/usr.sbin/pkg_add/check-sig b/regress/usr.sbin/pkg_add/check-sig
index f737a16d1e7..2f02d484c5b 100755
--- a/regress/usr.sbin/pkg_add/check-sig
+++ b/regress/usr.sbin/pkg_add/check-sig
@@ -1,10 +1,11 @@
#! /usr/bin/perl
-# $OpenBSD: check-sig,v 1.3 2014/08/27 18:45:57 kspillner Exp $
+# $OpenBSD: check-sig,v 1.4 2019/05/09 20:26:33 espie Exp $
# Written by Marc Espie
# Public domain
use Test::Simple tests => 11;
use OpenBSD::PackingList;
+use OpenBSD::State;
sub mycode
{
my ($fh, $cont) = @_;
@@ -20,17 +21,19 @@ for my $i (1..7) {
push(@sig, OpenBSD::PackingList->read($fh, \&mycode)->signature);
}
-ok($sig[0]->compare($sig[0]) == 0, "self compare");
-ok($sig[3]->compare($sig[3]) == 0, "self compare");
-ok($sig[5]->compare($sig[5]) == 0, "self compare");
-ok(!defined($sig[0]->compare($sig[3])), "non comparable");
-ok($sig[0]->compare($sig[1]) < 0, "depend");
-ok($sig[0]->compare($sig[2]) < 0, "pkgname");
-ok($sig[1]->compare($sig[0]) > 0, "other way");
-ok($sig[3]->compare($sig[4]) < 0, "lib");
-ok($sig[3]->compare($sig[5]) < 0, "depend");
-ok(!defined($sig[0]->compare($sig[6])), "non comparable");
-ok(!defined($sig[6]->compare($sig[0])), "non comparable");
+my $s = OpenBSD::State->new;
+
+ok($sig[0]->compare($sig[0], $s) == 0, "self compare");
+ok($sig[3]->compare($sig[3], $s) == 0, "self compare");
+ok($sig[5]->compare($sig[5], $s) == 0, "self compare");
+ok(!defined($sig[0]->compare($sig[3], $s)), "non comparable");
+ok($sig[0]->compare($sig[1], $s) < 0, "depend");
+ok($sig[0]->compare($sig[2], $s) < 0, "pkgname");
+ok($sig[1]->compare($sig[0], $s) > 0, "other way");
+ok($sig[3]->compare($sig[4], $s) < 0, "lib");
+ok($sig[3]->compare($sig[5], $s) < 0, "depend");
+ok(!defined($sig[0]->compare($sig[6], $s)), "non comparable");
+ok(!defined($sig[6]->compare($sig[0], $s)), "non comparable");
__DATA__
@name foo-1.0