From 470cf3f63b4d284dbaaef8da936e716438063ac1 Mon Sep 17 00:00:00 2001
From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Mon, 27 Jul 2015 12:37:11 +0100
Subject: Test suite: rename list-tests to enumerate-tests for ease of
 completion over tests/lib*

---
 tests/Makefile                 |   2 +-
 tests/enumerate-tests          | 107 +++++++++++++++++++++++++++++++++++++++++
 tests/list-tests               | 107 -----------------------------------------
 tests/tests/test-list-uptodate |   2 +-
 4 files changed, 109 insertions(+), 109 deletions(-)
 create mode 100755 tests/enumerate-tests
 delete mode 100755 tests/list-tests

(limited to 'tests')

diff --git a/tests/Makefile b/tests/Makefile
index 157b487..5bd3eee 100644
--- a/tests/Makefile
+++ b/tests/Makefile
@@ -1,7 +1,7 @@
 # usage: tests/using-intree make -f tests/Makefile
 # (optionally setting TESTSCRIPTS='tests/tests/foo tests/tests/bar')
 
-TESTSCRIPTS ?= $(shell tests/list-tests)
+TESTSCRIPTS ?= $(shell tests/enumerate-tests)
 TESTNAMES := $(notdir $(TESTSCRIPTS))
 
 all: $(foreach t,$(TESTNAMES),tests/tmp/$t.ok)
diff --git a/tests/enumerate-tests b/tests/enumerate-tests
new file mode 100755
index 0000000..912ee4f
--- /dev/null
+++ b/tests/enumerate-tests
@@ -0,0 +1,107 @@
+#!/bin/bash
+
+set -e
+
+. tests/lib-core
+. tests/lib-restricts
+
+mode=$1
+
+test-begin- () {
+	whynots=''
+}
+
+restriction- () {
+	set +e
+	whynot=$(t-restriction-$r)
+	rc=$?
+	set -e
+	case "$rc.$whynot" in
+	0.)	;;
+	1.?*)	whynots="$whynots${whynots:+; }$whynot" ;;
+	*)	fail "restriction $r for $t gave $rc $whynot !"
+	esac
+}
+
+dependencies- () {
+	:
+}
+
+test-done- () {
+	case "$whynots" in
+	'')	echo $t ;;
+	?*)	echo >&2 "SKIP $t $whynots" ;;
+	esac
+}
+
+finish- () {
+	:
+}
+
+test-begin-gencontrol () {
+	restrictions=''
+	dependencies=''
+}
+
+restriction-gencontrol () {
+	restrictions+=" $r"
+}
+
+dependencies-gencontrol () {
+	dependencies+=", $deps"
+}
+
+test-done-gencontrol () {
+	stanza=$(
+		add_Depends="$dependencies" \
+		perl <debian/tests/control.in -wpe '
+			if (/^(\w+):/) {
+				my $h = $1;
+				s{$}{ $ENV{"add_$h"} // "" }e;
+			}
+		' 
+		case "$restrictions" in
+		?*) echo "Restrictions:$restrictions" ;;
+		esac
+		)
+	key=$(printf "%s" "$stanza" | sha256sum)
+	key=${key%% *}
+	eval "
+		stanza_$key=\"\$stanza\"
+		tests_$key+=\" \${t#tests/tests/}\"
+	"
+	keys=" ${keys/ $key /}"
+	keys+=" $key "
+}
+
+finish-gencontrol () {
+	for key in $keys; do
+		eval "
+			stanza=\$stanza_$key
+			tests=\$tests_$key
+		"
+		printf "Tests:%s\n%s\n\n" "$tests" "$stanza"
+	done
+}
+
+seddery () {
+	local seddery=$1
+	sed <$t -n '
+		20q;
+		/^: t-enumerate-tests-end$/q;
+		'"$seddery"'
+	'
+}
+
+for t in $(run-parts --list tests/tests); do
+	test-begin-$mode
+	for r in $(seddery 's/^t-restrict //p'); do
+		restriction-$mode
+	done
+	for deps in $(seddery 's/^t-dependencies //p'); do
+		dependencies-$mode
+	done
+	test-done-$mode
+done
+
+finish-$mode
diff --git a/tests/list-tests b/tests/list-tests
deleted file mode 100755
index 8578fe6..0000000
--- a/tests/list-tests
+++ /dev/null
@@ -1,107 +0,0 @@
-#!/bin/bash
-
-set -e
-
-. tests/lib-core
-. tests/lib-restricts
-
-mode=$1
-
-test-begin- () {
-	whynots=''
-}
-
-restriction- () {
-	set +e
-	whynot=$(t-restriction-$r)
-	rc=$?
-	set -e
-	case "$rc.$whynot" in
-	0.)	;;
-	1.?*)	whynots="$whynots${whynots:+; }$whynot" ;;
-	*)	fail "restriction $r for $t gave $rc $whynot !"
-	esac
-}
-
-dependencies- () {
-	:
-}
-
-test-done- () {
-	case "$whynots" in
-	'')	echo $t ;;
-	?*)	echo >&2 "SKIP $t $whynots" ;;
-	esac
-}
-
-finish- () {
-	:
-}
-
-test-begin-gencontrol () {
-	restrictions=''
-	dependencies=''
-}
-
-restriction-gencontrol () {
-	restrictions+=" $r"
-}
-
-dependencies-gencontrol () {
-	dependencies+=", $deps"
-}
-
-test-done-gencontrol () {
-	stanza=$(
-		add_Depends="$dependencies" \
-		perl <debian/tests/control.in -wpe '
-			if (/^(\w+):/) {
-				my $h = $1;
-				s{$}{ $ENV{"add_$h"} // "" }e;
-			}
-		' 
-		case "$restrictions" in
-		?*) echo "Restrictions:$restrictions" ;;
-		esac
-		)
-	key=$(printf "%s" "$stanza" | sha256sum)
-	key=${key%% *}
-	eval "
-		stanza_$key=\"\$stanza\"
-		tests_$key+=\" \${t#tests/tests/}\"
-	"
-	keys=" ${keys/ $key /}"
-	keys+=" $key "
-}
-
-finish-gencontrol () {
-	for key in $keys; do
-		eval "
-			stanza=\$stanza_$key
-			tests=\$tests_$key
-		"
-		printf "Tests:%s\n%s\n\n" "$tests" "$stanza"
-	done
-}
-
-seddery () {
-	local seddery=$1
-	sed <$t -n '
-		20q;
-		/^: t-list-tests-end$/q;
-		'"$seddery"'
-	'
-}
-
-for t in $(run-parts --list tests/tests); do
-	test-begin-$mode
-	for r in $(seddery 's/^t-restrict //p'); do
-		restriction-$mode
-	done
-	for deps in $(seddery 's/^t-dependencies //p'); do
-		dependencies-$mode
-	done
-	test-done-$mode
-done
-
-finish-$mode
diff --git a/tests/tests/test-list-uptodate b/tests/tests/test-list-uptodate
index a2b4c5b..65812ff 100755
--- a/tests/tests/test-list-uptodate
+++ b/tests/tests/test-list-uptodate
@@ -5,5 +5,5 @@ set -e
 : "just verifies internal consistency of test suite"
 
 cd $root
-$troot/list-tests gencontrol >$tmp/control-expected
+$troot/enumerate-tests gencontrol >$tmp/control-expected
 diff debian/tests/control $tmp/control-expected
-- 
cgit v1.2.3