From: Torsten Bögershausen Date: Wed, 03 Apr 2013 05:54:02 GMT Subject: [PATCH] test-lint-duplicates: Only check for numbered test cases Message-ID: <201304030754.03100.tboegi@web.de> Running make inside contrib/remote-helpers fails in "test-lint-duplicates" This was because the regexp checking for duplicate numbers strips everything after the first "-" in the filename, including the prefix. As a result, 2 pathnames like "xxxx/contrib/remote-helpers/test-bzr.sh" and "xxxx/contrib/remote-helpers/test-hg-bidi.sh" are both converted into "xxxx/contrib/remote", and reported as duplicate. Improve the regexp: Remove everything after tNNNN- (where X stand for a digit) Signed-off-by: Torsten Bögershausen --- t/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/t/Makefile b/t/Makefile index 1923cc1..f123d02 100644 --- a/t/Makefile +++ b/t/Makefile @@ -48,7 +48,7 @@ clean: clean-except-prove-cache test-lint: test-lint-duplicates test-lint-executable test-lint-shell-syntax test-lint-duplicates: - @dups=`echo $(T) | tr ' ' '\n' | sed 's/-.*//' | sort | uniq -d` && \ + @dups=`echo $(T) | tr ' ' '\n' | sed -ne 's|\(.*/\)*t\([0-9][0-9][0-9][0-9]\)-.*|\2|p' | sort | uniq -d` && \ test -z "$$dups" || { \ echo >&2 "duplicate test numbers:" $$dups; exit 1; } -- 1.8.2.411.g65a544e