# [PATCH] test suite: add a check that all test numbers are unique 4 messages from 2009-08-21 to 2009-08-21. Participants: Johannes Sixt, Jeff King. Thread: https://gitlist.dev/t/20683 ## Johannes Sixt, 2009-08-21 09:28 Subject: [PATCH] test suite: add a check that all test numbers are unique Message-ID: <4A8E68AF.8040001@viscovery.net> URL: https://gitlist.dev/e/4A8E68AF.8040001%40viscovery.net ``` From: Johannes Sixt The test runs only if 'make all' is used. Its purpose is to alert our valued integrator if different branches are merged that happen to introduce the same test number. Signed-off-by: Johannes Sixt --- t/Makefile | 1 + t/check_unique_numbers.sh | 27 +++++++++++++++++++++++++++ 2 files changed, 28 insertions(+), 0 deletions(-) create mode 100755 t/check_unique_numbers.sh diff --git a/t/Makefile b/t/Makefile index bd09390..2a451b7 100644 --- a/t/Makefile +++ b/t/Makefile @@ -17,6 +17,7 @@ T = $(wildcard t[0-9][0-9][0-9][0-9]-*.sh) TSVN = $(wildcard t91[0-9][0-9]-*.sh) all: pre-clean + '$(SHELL_PATH_SQ)' ./check_unique_numbers.sh $(MAKE) aggregate-results-and-cleanup $(T): diff --git a/t/check_unique_numbers.sh b/t/check_unique_numbers.sh new file mode 100755 index 0000000..e767275 --- /dev/null +++ b/t/check_unique_numbers.sh @@ -0,0 +1,27 @@ +#!/bin/sh + +# checks whether test case numbers are unique; +# returns non-zero if any duplicates were found + +check_numbers () { + last= dup= + while read name + do + case $name in + t[0-9][0-9][0-9][0-9]-*.sh) + number=${name%%-*} + if test "$number" = "$last"; then + dup="$dup $number" + fi + last=$number + ;; + esac + done + test -z "$dup" || { + echo >&2 "error: duplicate test numbers:" $dup + return 1 + } +} + +ls -1 | # no wildcard to avoid overflow of command line +check_numbers -- 1.6.4.204.g6aad7 ``` ## Jeff King, 2009-08-21 12:53 Subject: Re: [PATCH] test suite: add a check that all test numbers are unique Message-ID: <20090821125324.GA6280@coredump.intra.peff.net> URL: https://gitlist.dev/e/20090821125324.GA6280%40coredump.intra.peff.net In-Reply-To: <4A8E68AF.8040001@viscovery.net> ``` On Fri, Aug 21, 2009 at 11:28:15AM +0200, Johannes Sixt wrote: > The test runs only if 'make all' is used. Its purpose is to alert our > valued integrator if different branches are merged that happen to > introduce the same test number. I think this is probably useful. In addition to the t7406 you posted a patch for, it looks like t4037 has a duplicate in next. As for the implementation: > +++ b/t/check_unique_numbers.sh > @@ -0,0 +1,27 @@ > +#!/bin/sh > + > +# checks whether test case numbers are unique; > +# returns non-zero if any duplicates were found > + > +check_numbers () { > + last= dup= > + while read name > + do > + case $name in > + t[0-9][0-9][0-9][0-9]-*.sh) > + number=${name%%-*} > + if test "$number" = "$last"; then > + dup="$dup $number" > + fi > + last=$number > + ;; > + esac > + done > + test -z "$dup" || { > + echo >&2 "error: duplicate test numbers:" $dup > + return 1 > + } > +} > + > +ls -1 | # no wildcard to avoid overflow of command line > +check_numbers Why not the much shorter: tests() { ls | sed -n 's/^\(t[0-9][0-9][0-9][0-9]\)-.*\.sh$/\1/p' } dups=`tests | uniq -d` instead of the long shell loop? -Peff ``` ## Johannes Sixt, 2009-08-21 13:13 Subject: [PATCH v2] test suite: add a check that all test numbers are unique Message-ID: <4A8E9D73.1090604@viscovery.net> URL: https://gitlist.dev/e/4A8E9D73.1090604%40viscovery.net In-Reply-To: <20090821125324.GA6280@coredump.intra.peff.net> ``` Jeff King schrieb: > Why not the much shorter: > > tests() { > ls | sed -n 's/^\(t[0-9][0-9][0-9][0-9]\)-.*\.sh$/\1/p' > } > dups=`tests | uniq -d` > > instead of the long shell loop? Because it's faster on Windows ;-) No, seriously, I didn't know about uniq -d. Here is a replacement patch. --- 8< --- From: Johannes Sixt Subject: [PATCH] t/Makefile: add a check that all test numbers are unique The test runs only if 'make all' is used. Its purpose is to alert our valued integrator if different branches are merged that happen to introduce the same test number. Signed-off-by: Johannes Sixt --- t/Makefile | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/t/Makefile b/t/Makefile index bd09390..ed8281a 100644 --- a/t/Makefile +++ b/t/Makefile @@ -17,6 +17,10 @@ T = $(wildcard t[0-9][0-9][0-9][0-9]-*.sh) TSVN = $(wildcard t91[0-9][0-9]-*.sh) all: pre-clean + @dups=`ls | sed -n 's/^\(t[0-9][0-9][0-9][0-9]\)-.*\.sh$$/\1/p' | \ + uniq -d` && \ + test -z "$$dups" || { \ + echo "duplicate test numbers:" $$dups; exit 1; } $(MAKE) aggregate-results-and-cleanup $(T): -- 1.6.4.204.g6aad7 ``` ## Jeff King, 2009-08-21 14:37 Subject: Re: [PATCH v2] test suite: add a check that all test numbers are unique Message-ID: <20090821143700.GA6850@coredump.intra.peff.net> URL: https://gitlist.dev/e/20090821143700.GA6850%40coredump.intra.peff.net In-Reply-To: <4A8E9D73.1090604@viscovery.net> ``` On Fri, Aug 21, 2009 at 03:13:23PM +0200, Johannes Sixt wrote: > Because it's faster on Windows ;-) No, seriously, I didn't know about > uniq -d. :) > Here is a replacement patch. Looks good to me. Thanks. -Peff ```