{"thread":{"id":"26037","subject":"[PATCH] Avoid duplicate test number t7609","startedAt":"2010-12-13T10:14:02Z","lastAt":"2010-12-13T19:58:46Z","messageCount":7,"participants":["Johannes Sixt","Michael J Gruber","Jeff King","Junio C Hamano"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"157957","messageId":"4D05F1EA.9000403@viscovery.net","threadId":"26037","inReplyTo":null,"subject":"[PATCH] Avoid duplicate test number t7609","fromName":"Johannes Sixt","fromEmail":"j.sixt@viscovery.net","sentAt":"2010-12-13T10:14:02Z","receivedAt":"2010-12-13T10:14:02Z","isPatch":true,"sender":{"key":"j6t@kdbg.org","avatar":"https://avatars.githubusercontent.com/u/14810926?v=4"},"body":"From: Johannes Sixt \n\nSigned-off-by: Johannes Sixt \n---\n t/{t7609-merge-abort.sh => t7611-merge-abort.sh} | 0\n 1 files changed, 0 insertions(+), 0 deletions(-)\n rename t/{t7609-merge-abort.sh => t7611-merge-abort.sh} (100%)\n\ndiff --git a/t/t7609-merge-abort.sh b/t/t7611-merge-abort.sh\nsimilarity index 100%\nrename from t/t7609-merge-abort.sh\nrename to t/t7611-merge-abort.sh\n-- \n1.7.3.3.1800.g26f22\n"},{"id":"157965","messageId":"52f777e518583955f78b71e96b3c8ff53d25b608.1292256498.git.git@drmicha.warpmail.net","threadId":"26037","inReplyTo":"4D05F1EA.9000403@viscovery.net","subject":"[PATCH/RFC] t800?-blame.sh: retitle uniquely","fromName":"Michael J Gruber","fromEmail":"git@drmicha.warpmail.net","sentAt":"2010-12-13T16:12:29Z","receivedAt":"2010-12-13T16:12:29Z","isPatch":true,"sender":{"key":"git@grubix.eu","avatar":"https://avatars.githubusercontent.com/u/233215?v=4"},"body":"Currently we have three test files matching t800?-blame.sh.\n\nRename the latter two to make it easier to spot where additions would\ngo.\n\nSigned-off-by: Michael J Gruber \n---\nOn a related note to J6t's patch, how's the stance on unique titles?\nUnique numbers are important for partial test runs, of course,\nbut unique titles help finding you way through the test.\nThere are more than the blame.sh ones.\n\n t/{t8003-blame.sh => t8003-blame-corner-cases.sh} | 0\n ...8004-blame.sh => t8004-blame-with-conflicts.sh} | 0\n 2 files changed, 0 insertions(+), 0 deletions(-)\n rename t/{t8003-blame.sh => t8003-blame-corner-cases.sh} (100%)\n rename t/{t8004-blame.sh => t8004-blame-with-conflicts.sh} (100%)\n\ndiff --git a/t/t8003-blame.sh b/t/t8003-blame-corner-cases.sh\nsimilarity index 100%\nrename from t/t8003-blame.sh\nrename to t/t8003-blame-corner-cases.sh\ndiff --git a/t/t8004-blame.sh b/t/t8004-blame-with-conflicts.sh\nsimilarity index 100%\nrename from t/t8004-blame.sh\nrename to t/t8004-blame-with-conflicts.sh\n-- \n1.7.3.3.738.g018bc\n"},{"id":"157972","messageId":"20101213170734.GA24736@sigill.intra.peff.net","threadId":"26037","inReplyTo":"52f777e518583955f78b71e96b3c8ff53d25b608.1292256498.git.git@drmicha.warpmail.net","subject":"Re: [PATCH/RFC] t800?-blame.sh: retitle uniquely","fromName":"Jeff King","fromEmail":"peff@peff.net","sentAt":"2010-12-13T17:07:34Z","receivedAt":"2010-12-13T17:07:34Z","isPatch":true,"sender":{"key":"peff@peff.net","avatar":"https://avatars.githubusercontent.com/u/45925?v=4"},"body":"On Mon, Dec 13, 2010 at 05:12:29PM +0100, Michael J Gruber wrote:\n\n> On a related note to J6t's patch, how's the stance on unique titles?\n> Unique numbers are important for partial test runs, of course,\n> but unique titles help finding you way through the test.\n> There are more than the blame.sh ones.\n\nI don't think it is a big deal, but I did just 5 minutes ago get annoyed\nat:\n\n t7500-commit.sh\n t7501-commit.sh\n t7502-commit.sh\n t7509-commit.sh\n\nSpeaking of minor test issues, we should probably also do this:\n\n-- >8 --\nSubject: [PATCH] tests: flip executable bit on t9158\n\nAll tests are supposed to be executable.\n\nSigned-off-by: Jeff King \n---\n 0 files changed, 0 insertions(+), 0 deletions(-)\n mode change 100644 => 100755 t/t9158-git-svn-mergeinfo.sh\n\ndiff --git a/t/t9158-git-svn-mergeinfo.sh b/t/t9158-git-svn-mergeinfo.sh\nold mode 100644\nnew mode 100755\n-- \n1.7.3.3.784.gccc31.dirty\n"},{"id":"157973","messageId":"20101213172238.GA16136@sigill.intra.peff.net","threadId":"26037","inReplyTo":"20101213170734.GA24736@sigill.intra.peff.net","subject":"Re: [PATCH/RFC] t800?-blame.sh: retitle uniquely","fromName":"Jeff King","fromEmail":"peff@peff.net","sentAt":"2010-12-13T17:22:38Z","receivedAt":"2010-12-13T17:22:38Z","isPatch":true,"sender":{"key":"peff@peff.net","avatar":"https://avatars.githubusercontent.com/u/45925?v=4"},"body":"On Mon, Dec 13, 2010 at 12:07:34PM -0500, Jeff King wrote:\n\n> Speaking of minor test issues, we should probably also do this:\n> \n> -- >8 --\n> Subject: [PATCH] tests: flip executable bit on t9158\n\nBTW, I will plug my test-lint patch once again, which caught both this\nand the duplicate test number mentioned earlier.\n\n-- >8 --\nSubject: [PATCH] tests: add some script lint checks\n\nThere are some common but minor errors we tend to make in\nwriting test scripts:\n\n 1. Scripts are left non-executable. This is not usually\n noticed immediately because \"make test\" does not need\n the bit, but it is a matter of git policy to make them\n executable (and is a slight convenience when running\n individual scripts).\n\n 2. Two scripts are allocated the same number. Usually this\n happens on separate branches, and the problem only\n comes about during a merge. But since there is no\n textual conflict, the merger would have to be very\n observant to notice.\n\n This is also a minor error, but can make GIT_SKIP_TESTS\n ambiguous.\n\nThis patch introduces a \"test-lint\" target which checks\nboth. It is not invoked by default. You can invoke it as\n\"make test-lint\", or you can make it a prerequisite of\nrunning the tests by specifying \"TEST_LINT = test-lint\" in\nyour config.mak or on the command line.\n\nSigned-off-by: Jeff King \n---\n t/Makefile | 16 ++++++++++++++--\n 1 files changed, 14 insertions(+), 2 deletions(-)\n\ndiff --git a/t/Makefile b/t/Makefile\nindex 73c6ec4..47cbeb6 100644\n--- a/t/Makefile\n+++ b/t/Makefile\n@@ -23,10 +23,10 @@ TGITWEB = $(wildcard t95[0-9][0-9]-*.sh)\n \n all: $(DEFAULT_TEST_TARGET)\n \n-test: pre-clean\n+test: pre-clean $(TEST_LINT)\n \t$(MAKE) aggregate-results-and-cleanup\n \n-prove: pre-clean\n+prove: pre-clean $(TEST_LINT)\n \t@echo \"*** prove ***\"; GIT_CONFIG=.git/config $(PROVE) --exec '$(SHELL_PATH_SQ)' $(GIT_PROVE_OPTS) $(T) :: $(GIT_TEST_OPTS)\n \t$(MAKE) clean\n \n@@ -41,6 +41,18 @@ clean:\n \t$(RM) -r valgrind/bin\n \t$(RM) .prove\n \n+test-lint: test-lint-duplicates test-lint-executable\n+\n+test-lint-duplicates:\n+\t@dups=`echo $(T) | tr ' ' '\\n' | sed 's/-.*//' | sort | uniq -d` && \\\n+\t\ttest -z \"$$dups\" || { \\\n+\t\techo >&2 \"duplicate test numbers:\" $$dups; exit 1; }\n+\n+test-lint-executable:\n+\t@bad=`for i in $(T); do test -x \"$$i\" || echo $$i; done` && \\\n+\t\ttest -z \"$$bad\" || { \\\n+\t\techo >&2 \"non-executable tests:\" $$bad; exit 1; }\n+\n aggregate-results-and-cleanup: $(T)\n \t$(MAKE) aggregate-results\n \t$(MAKE) clean\n-- \n1.7.3.3.784.gccc31.dirty\n"},{"id":"157991","messageId":"7vk4jdzcng.fsf@alter.siamese.dyndns.org","threadId":"26037","inReplyTo":"20101213172238.GA16136@sigill.intra.peff.net","subject":"Re: [PATCH/RFC] t800?-blame.sh: retitle uniquely","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2010-12-13T19:38:27Z","receivedAt":"2010-12-13T19:38:27Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Thanks.\n"},{"id":"157993","messageId":"7vfwu1zc0x.fsf@alter.siamese.dyndns.org","threadId":"26037","inReplyTo":"20101213170734.GA24736@sigill.intra.peff.net","subject":"Re: [PATCH/RFC] t800?-blame.sh: retitle uniquely","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2010-12-13T19:51:58Z","receivedAt":"2010-12-13T19:51:58Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Jeff King writes:\n\n> On Mon, Dec 13, 2010 at 05:12:29PM +0100, Michael J Gruber wrote:\n>\n>> On a related note to J6t's patch, how's the stance on unique titles?\n>> Unique numbers are important for partial test runs, of course,\n>> but unique titles help finding you way through the test.\n>> There are more than the blame.sh ones.\n>\n> I don't think it is a big deal, but I did just 5 minutes ago get annoyed\n> at:\n>\n> t7500-commit.sh\n> t7501-commit.sh\n> t7502-commit.sh\n> t7509-commit.sh\n\nt7509 seems to be about the authorship, so it is easy to rename it to\nt7509-commit-authorship or something, but unfortunately I do not see\nunifying theme in any of t750[012]. They test random things and there\nseem to be overlaps.\n\nPerhaps somebody wants to consolidate these three into one?\n"},{"id":"157995","messageId":"20101213195846.GA18355@sigill.intra.peff.net","threadId":"26037","inReplyTo":"7vfwu1zc0x.fsf@alter.siamese.dyndns.org","subject":"Re: [PATCH/RFC] t800?-blame.sh: retitle uniquely","fromName":"Jeff King","fromEmail":"peff@peff.net","sentAt":"2010-12-13T19:58:46Z","receivedAt":"2010-12-13T19:58:46Z","isPatch":true,"sender":{"key":"peff@peff.net","avatar":"https://avatars.githubusercontent.com/u/45925?v=4"},"body":"On Mon, Dec 13, 2010 at 11:51:58AM -0800, Junio C Hamano wrote:\n\n> > t7500-commit.sh\n> > t7501-commit.sh\n> > t7502-commit.sh\n> > t7509-commit.sh\n> \n> t7509 seems to be about the authorship, so it is easy to rename it to\n> t7509-commit-authorship or something, but unfortunately I do not see\n> unifying theme in any of t750[012]. They test random things and there\n> seem to be overlaps.\n\nI read through them and came to the same conclusion.\n\n> Perhaps somebody wants to consolidate these three into one?\n\nI think this falls into my \"would be nice if it had been written cleaner\nin the first place, but is not worth the time to clean up\" category. But\nif somebody else is willing to work on it, I have no objection. :)\n\n-Peff\n"}]}