From 470cf3f63b4d284dbaaef8da936e716438063ac1 Mon Sep 17 00:00:00 2001 From: Ian Jackson Date: Mon, 27 Jul 2015 12:37:11 +0100 Subject: [PATCH] Test suite: rename list-tests to enumerate-tests for ease of completion over tests/lib* --- debian/rules | 2 +- tests/Makefile | 2 +- tests/{list-tests => enumerate-tests} | 2 +- tests/tests/test-list-uptodate | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) rename tests/{list-tests => enumerate-tests} (97%) diff --git a/debian/rules b/debian/rules index 0a5933b6..6357268d 100755 --- a/debian/rules +++ b/debian/rules @@ -34,7 +34,7 @@ override_dh_auto_install: make install prefix=/usr DESTDIR=debian/dgit make install-infra prefix=/usr DESTDIR=debian/dgit-infrastructure -debian/tests/control: tests/list-tests debian/tests/control.in +debian/tests/control: tests/enumerate-tests debian/tests/control.in $< gencontrol >$@.new && mv -f $@.new $@ debian/tests/control: tests/lib-core tests/lib-restricts diff --git a/tests/Makefile b/tests/Makefile index 157b487b..5bd3eee2 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/list-tests b/tests/enumerate-tests similarity index 97% rename from tests/list-tests rename to tests/enumerate-tests index 8578fe60..912ee4ff 100755 --- a/tests/list-tests +++ b/tests/enumerate-tests @@ -88,7 +88,7 @@ seddery () { local seddery=$1 sed <$t -n ' 20q; - /^: t-list-tests-end$/q; + /^: t-enumerate-tests-end$/q; '"$seddery"' ' } diff --git a/tests/tests/test-list-uptodate b/tests/tests/test-list-uptodate index a2b4c5b8..65812ff9 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 -- 2.30.2