From fe698b054a48d174f3619b4255cde448638f4b1d Mon Sep 17 00:00:00 2001
From: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
Date: Mon, 29 Jan 2018 13:57:56 +0100
Subject: Add more archive keys: Geogebra, Grandorgue and DebMultimedia.

---
 t/keyids-complete.t | 30 ++++--------------------------
 t/no-expired.t      |  2 +-
 2 files changed, 5 insertions(+), 27 deletions(-)

(limited to 't')

diff --git a/t/keyids-complete.t b/t/keyids-complete.t
index 58c0f81..8b0de88 100755
--- a/t/keyids-complete.t
+++ b/t/keyids-complete.t
@@ -1,37 +1,15 @@
 #!/bin/sh
-# Makes sure every key in arctica-*-gpg has an entry in the
+# Makes sure every key in *-keyring-gpg has an entry in the
 # keyids mapping file.
 set -e
 
 fail=0
 
-for keyring in arctica-keyring-gpg; do
+for keyring in arctica-keyring-gpg itzks-keyring-gpg x2go-keyring-gpg debmultimedia-keyring-gpg geogebra-keyring-gpg grandorgue-keyring-gpg; do
 	cd $keyring
 	for key in 0x*; do
-		if ! grep -q "^$key " ../keyids.arctica; then
-			echo "$keyring: $key is not in keyids.arctica file."
-			fail=1
-		fi
-	done
-	cd ..
-done
-
-for keyring in itzks-keyring-gpg; do
-	cd $keyring
-	for key in 0x*; do
-		if ! grep -q "^$key " ../keyids.itzks; then
-			echo "$keyring: $key is not in keyids.itzks file."
-			fail=1
-		fi
-	done
-	cd ..
-done
-
-for keyring in x2go-keyring-gpg; do
-	cd $keyring
-	for key in 0x*; do
-		if ! grep -q "^$key " ../keyids.x2go; then
-			echo "$keyring: $key is not in keyids.x2go file."
+		if ! grep -q "^$key " ../keyids; then
+			echo "$keyring: $key is not in keyids file."
 			fail=1
 		fi
 	done
diff --git a/t/no-expired.t b/t/no-expired.t
index 5af0e1c..2d64129 100755
--- a/t/no-expired.t
+++ b/t/no-expired.t
@@ -12,7 +12,7 @@ find_expired () {
 }
 
 fail=0
-for keyring in arctica-keyring.gpg itzks-keyring.gpg x2go-keyring.gpg; do
+for keyring in arctica-keyring.gpg itzks-keyring.gpg x2go-keyring.gpg debmultimedia-keyring.gpg geogebra-keyring.gpg grandorgue-keyring.gpg; do
 	find_expired $keyring
 done
 
-- 
cgit v1.2.3