Fix rpki-client regress after -j -f change

diff --git a/regress/usr.sbin/rpki-client/test-cert.c b/regress/usr.sbin/rpki-client/test-cert.c
index 03111ab..5d94ef2 100644 (file)
--- a/regress/usr.sbin/rpki-client/test-cert.c
+++ b/regress/usr.sbin/rpki-client/test-cert.c
@@ -1,4 +1,4 @@
-/*     $Id: test-cert.c,v 1.18 2022/04/02 12:23:20 claudio Exp $ */
+/*     $Id: test-cert.c,v 1.19 2022/04/20 17:26:53 tb Exp $ */
 /*
  * Copyright (c) 2019 Kristaps Dzonsons <kristaps@bsd.lv>
  *
@@ -32,6 +32,7 @@
 
 #include "extern.h"
 
+int outformats;
 int verbose;
 
 int

diff --git a/regress/usr.sbin/rpki-client/test-gbr.c b/regress/usr.sbin/rpki-client/test-gbr.c
index 81c6b75..2143731 100644 (file)
--- a/regress/usr.sbin/rpki-client/test-gbr.c
+++ b/regress/usr.sbin/rpki-client/test-gbr.c
@@ -1,4 +1,4 @@
-/*     $Id: test-gbr.c,v 1.6 2022/01/19 08:24:43 claudio Exp $ */
+/*     $Id: test-gbr.c,v 1.7 2022/04/20 17:26:53 tb Exp $ */
 /*
  * Copyright (c) 2019 Kristaps Dzonsons <kristaps@bsd.lv>
  *
@@ -30,6 +30,7 @@
 
 #include "extern.h"
 
+int outformats;
 int verbose;
 
 int
@@ -77,7 +78,7 @@ main(int argc, char *argv[])
                        continue;
                }
                if (verb)
-                       gbr_print(p);
+                       gbr_print(xp, p);
                if (ppem) {
                        if (!PEM_write_bio_X509(bio_out, xp))
                                errx(1,

diff --git a/regress/usr.sbin/rpki-client/test-ip.c b/regress/usr.sbin/rpki-client/test-ip.c
index 4f802b1..873b58a 100644 (file)
--- a/regress/usr.sbin/rpki-client/test-ip.c
+++ b/regress/usr.sbin/rpki-client/test-ip.c
@@ -1,4 +1,4 @@
-/*     $Id: test-ip.c,v 1.4 2019/08/22 21:31:48 bluhm Exp $ */
+/*     $Id: test-ip.c,v 1.5 2022/04/20 17:26:53 tb Exp $ */
 /*
  * Copyright (c) 2019 Kristaps Dzonsons <kristaps@bsd.lv>
  *
@@ -31,6 +31,7 @@
 
 #include "extern.h"
 
+int outformats;
 int verbose;
 
 static void

diff --git a/regress/usr.sbin/rpki-client/test-mft.c b/regress/usr.sbin/rpki-client/test-mft.c
index c87cd60..a89e385 100644 (file)
--- a/regress/usr.sbin/rpki-client/test-mft.c
+++ b/regress/usr.sbin/rpki-client/test-mft.c
@@ -1,4 +1,4 @@
-/*     $Id: test-mft.c,v 1.18 2022/01/19 08:24:43 claudio Exp $ */
+/*     $Id: test-mft.c,v 1.19 2022/04/20 17:26:53 tb Exp $ */
 /*
  * Copyright (c) 2019 Kristaps Dzonsons <kristaps@bsd.lv>
  *
@@ -33,6 +33,7 @@
 
 #include "extern.h"
 
+int outformats;
 int verbose;
 
 int
@@ -79,7 +80,7 @@ main(int argc, char *argv[])
                        continue;
                }
                if (verb)
-                       mft_print(p);
+                       mft_print(xp, p);
                if (ppem) {
                        if (!PEM_write_bio_X509(bio_out, xp))
                                errx(1,

diff --git a/regress/usr.sbin/rpki-client/test-roa.c b/regress/usr.sbin/rpki-client/test-roa.c
index 34c2236..7facb0c 100644 (file)
--- a/regress/usr.sbin/rpki-client/test-roa.c
+++ b/regress/usr.sbin/rpki-client/test-roa.c
@@ -1,4 +1,4 @@
-/*     $Id: test-roa.c,v 1.15 2022/01/19 08:24:43 claudio Exp $ */
+/*     $Id: test-roa.c,v 1.16 2022/04/20 17:26:53 tb Exp $ */
 /*
  * Copyright (c) 2019 Kristaps Dzonsons <kristaps@bsd.lv>
  *
@@ -30,6 +30,7 @@
 
 #include "extern.h"
 
+int outformats;
 int verbose;
 
 int
@@ -76,7 +77,7 @@ main(int argc, char *argv[])
                        continue;
                }
                if (verb)
-                       roa_print(p);
+                       roa_print(xp, p);
                if (ppem) {
                        if (!PEM_write_bio_X509(bio_out, xp))
                                errx(1,

diff --git a/regress/usr.sbin/rpki-client/test-tal.c b/regress/usr.sbin/rpki-client/test-tal.c
index 965813b..587c588 100644 (file)
--- a/regress/usr.sbin/rpki-client/test-tal.c
+++ b/regress/usr.sbin/rpki-client/test-tal.c
@@ -1,4 +1,4 @@
-/*     $Id: test-tal.c,v 1.8 2021/10/26 16:59:54 claudio Exp $ */
+/*     $Id: test-tal.c,v 1.9 2022/04/20 17:26:53 tb Exp $ */
 /*
  * Copyright (c) 2019 Kristaps Dzonsons <kristaps@bsd.lv>
  *
@@ -29,6 +29,7 @@
 
 #include "extern.h"
 
+int outformats;
 int verbose;
 
 int