Running make inside contrib/remote-helpers may fail 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-XX.sh" and
"xxxx/contrib/remote-helpers/test-YY.sh"

are both converted into
"xxxx/contrib/remote", and reported as duplicate.

Improve the regexp:
- strip the leading path and look only at the basename
- only look at files which have tNNNN- (where N stand for a digit) in the name

Signed-off-by: Torsten Bögershausen <tbo...@web.de>
---

http://comments.gmane.org/gmane.comp.version-control.git/214194

 t/Makefile | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/t/Makefile b/t/Makefile
index 1923cc1..cfd6d5a 100644
--- a/t/Makefile
+++ b/t/Makefile
@@ -48,7 +48,9 @@ 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 -e 's,.*/,,' -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.282.g4bc7171

--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to