{"thread":{"id":"11093","subject":"make test failure with latest master","startedAt":"2007-12-02T12:29:50Z","lastAt":"2007-12-05T05:44:38Z","messageCount":18,"participants":["A Large Angry SCM","Jakub Narebski","Jeff King","Johannes Schindelin","Johannes Sixt","Junio C Hamano"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"61637","messageId":"4752A53E.4030000@gmail.com","threadId":"11093","inReplyTo":null,"subject":"make test failure with latest master","fromName":"A Large Angry SCM","fromEmail":"gitzilla@gmail.com","sentAt":"2007-12-02T12:29:50Z","receivedAt":"2007-12-02T12:29:50Z","isPatch":false,"sender":{"key":"gitzilla@gmail.com","avatar":"https://gravatar.com/avatar/354625c442439908ff3dd99757dee330e29e9df7847472384faf7a00add247fb?d=mp&s=160"},"body":"[Resent due to incorrect list address.]\n\nWith the latest master, 2221a6757161af1905925c405aded9ff470f70d5, \"make \ntest\" now fails; last successful \"make test\" was mid-week sometime with \nmaster d25430. This is on a laptop running Suse 9.3.\n\n\n*** t9600-cvsimport.sh ***\n*   ok 1: setup cvsroot\n*   ok 2: setup a cvs module\n* FAIL 3: import a trivial module\n\n\n                 git cvsimport -a -z 0 -C module-git module &&\n                 git diff module-cvs/o_fortuna module-git/o_fortuna\n\n\n*   ok 4: pack refs\n*   ok 5: update cvs module\n* FAIL 6: update git module\n\n\n                 cd module-git &&\n                 git cvsimport -a -z 0 module &&\n                 git merge origin &&\n                 cd .. &&\n                 git diff module-cvs/o_fortuna module-git/o_fortuna\n\n\n*   ok 7: update cvs module\n* FAIL 8: cvsimport.module config works\n\n\n                 cd module-git &&\n                         git config cvsimport.module module &&\n                         git cvsimport -a -z0 &&\n                         git merge origin &&\n                 cd .. &&\n                 git diff module-cvs/tick module-git/tick\n\n\n* failed 3 among 8 test(s)\n"},{"id":"61638","messageId":"m3fxylw95y.fsf@roke.D-201","threadId":"11093","inReplyTo":"4752A53E.4030000@gmail.com","subject":"Re: make test failure with latest master","fromName":"Jakub Narebski","fromEmail":"jnareb@gmail.com","sentAt":"2007-12-02T12:52:51Z","receivedAt":"2007-12-02T12:52:51Z","isPatch":false,"sender":{"key":"jnareb@gmail.com","avatar":"https://avatars.githubusercontent.com/u/2706?v=4"},"body":"A Large Angry SCM <gitzilla@gmail.com> writes:\n\n> [Resent due to incorrect list address.]\n> \n> With the latest master, 2221a6757161af1905925c405aded9ff470f70d5,\n> \"make test\" now fails; last successful \"make test\" was mid-week\n> sometime with master d25430. This is on a laptop running Suse 9.3.\n> \n> \n> *** t9600-cvsimport.sh ***\n\nTrivial question: have you got cvs and cvsps installed?\n\n-- \nJakub Narebski\n"},{"id":"61640","messageId":"4752BABF.1040707@gmail.com","threadId":"11093","inReplyTo":"m3fxylw95y.fsf@roke.D-201","subject":"Re: make test failure with latest master","fromName":"A Large Angry SCM","fromEmail":"gitzilla@gmail.com","sentAt":"2007-12-02T14:01:35Z","receivedAt":"2007-12-02T14:01:35Z","isPatch":false,"sender":{"key":"gitzilla@gmail.com","avatar":"https://gravatar.com/avatar/354625c442439908ff3dd99757dee330e29e9df7847472384faf7a00add247fb?d=mp&s=160"},"body":"Jakub Narebski wrote:\n> A Large Angry SCM <gitzilla@gmail.com> writes:\n> \n>> [Resent due to incorrect list address.]\n>>\n>> With the latest master, 2221a6757161af1905925c405aded9ff470f70d5,\n>> \"make test\" now fails; last successful \"make test\" was mid-week\n>> sometime with master d25430. This is on a laptop running Suse 9.3.\n>>\n>>\n>> *** t9600-cvsimport.sh ***\n> \n> Trivial question: have you got cvs and cvsps installed?\n> \n\nYes. With the following (rpm based) versions:\n\n\tcvs-1.12.12-2.1\n\tcvsps-1.99-155.2\n\tcvsup-16.1h-173\n\tviewcvs-1.0-11\n"},{"id":"61651","messageId":"20071202163426.GA29781@coredump.intra.peff.net","threadId":"11093","inReplyTo":"4752A53E.4030000@gmail.com","subject":"Re: make test failure with latest master","fromName":"Jeff King","fromEmail":"peff@peff.net","sentAt":"2007-12-02T16:34:26Z","receivedAt":"2007-12-02T16:34:26Z","isPatch":false,"sender":{"key":"peff@peff.net","avatar":"https://avatars.githubusercontent.com/u/45925?v=4"},"body":"On Sun, Dec 02, 2007 at 07:29:50AM -0500, A Large Angry SCM wrote:\n\n> With the latest master, 2221a6757161af1905925c405aded9ff470f70d5, \"make \n> test\" now fails; last successful \"make test\" was mid-week sometime with \n> master d25430. This is on a laptop running Suse 9.3.\n>\n> *** t9600-cvsimport.sh ***\n> *   ok 1: setup cvsroot\n> *   ok 2: setup a cvs module\n> * FAIL 3: import a trivial module\n>\n>\n>                 git cvsimport -a -z 0 -C module-git module &&\n>                 git diff module-cvs/o_fortuna module-git/o_fortuna\n\nCan you please try ./t9600 --verbose? Presumably cvsimport is generating\nsome kind of error message to tell us what's going on.\n\n-Peff\n"},{"id":"61696","messageId":"47533D75.1090002@gmail.com","threadId":"11093","inReplyTo":"20071202163426.GA29781@coredump.intra.peff.net","subject":"Re: make test failure with latest master","fromName":"A Large Angry SCM","fromEmail":"gitzilla@gmail.com","sentAt":"2007-12-02T23:19:17Z","receivedAt":"2007-12-02T23:19:17Z","isPatch":false,"sender":{"key":"gitzilla@gmail.com","avatar":"https://gravatar.com/avatar/354625c442439908ff3dd99757dee330e29e9df7847472384faf7a00add247fb?d=mp&s=160"},"body":"Jeff King wrote:\n> On Sun, Dec 02, 2007 at 07:29:50AM -0500, A Large Angry SCM wrote:\n> \n>> With the latest master, 2221a6757161af1905925c405aded9ff470f70d5, \"make \n>> test\" now fails; last successful \"make test\" was mid-week sometime with \n>> master d25430. This is on a laptop running Suse 9.3.\n>>\n>> *** t9600-cvsimport.sh ***\n>> *   ok 1: setup cvsroot\n>> *   ok 2: setup a cvs module\n>> * FAIL 3: import a trivial module\n>>\n>>\n>>                 git cvsimport -a -z 0 -C module-git module &&\n>>                 git diff module-cvs/o_fortuna module-git/o_fortuna\n> \n> Can you please try ./t9600 --verbose? Presumably cvsimport is generating\n> some kind of error message to tell us what's going on.\n\nAttached is the output of\n\n\t./t9600-cvsimport.sh --verbose >/tmp/9600_out.txt 2>&1\n\n\n* expecting success: cvs init\n*   ok 1: setup cvsroot\n\n* expecting success: \n\n\tmkdir $CVSROOT/module &&\n\tcvs co -d module-cvs module &&\n\tcd module-cvs &&\n\tcat <<EOF >o_fortuna &&\nO Fortuna\nvelut luna\nstatu variabilis,\n\nsemper crescis\naut decrescis;\nvita detestabilis\n\nnunc obdurat\net tunc curat\nludo mentis aciem,\n\negestatem,\npotestatem\ndissolvit ut glaciem.\nEOF\n\tcvs add o_fortuna &&\n\tcat <<EOF >message &&\nadd \"O Fortuna\" lyrics\n\nThese public domain lyrics make an excellent sample text.\nEOF\n\tcvs commit -F message &&\n\tcd ..\n\ncvs checkout: Updating module-cvs\ncvs add: scheduling file `o_fortuna' for addition\ncvs add: use `cvs commit' to add this file permanently\ncvs commit: Examining .\n/home/internet/GIT/git/t/trash/cvsroot/module/o_fortuna,v  <--  o_fortuna\ninitial revision: 1.1\n*   ok 2: setup a cvs module\n\n* expecting success: \n\n\tgit cvsimport -a -z 0 -C module-git module &&\n\tgit diff module-cvs/o_fortuna module-git/o_fortuna\n\n\nInitialized empty Git repository in /home/internet/GIT/git/t/trash/module-git/.git/\n\nbad usage: invalid argument -A\n\nUsage: cvsps [-h] [-x] [-u] [-z <fuzz>] [-g] [-s <range>[,<range>]]  \n             [-a <author>] [-f <file>] [-d <date1> [-d <date2>]] \n             [-b <branch>]  [-l <regex>] [-r <tag> [-r <tag>]] \n             [-p <directory>] [-v] [-t] [--norc] [--summary-first]\n             [--test-log <captured cvs log file>] [--bkcvs]\n             [--no-rlog] [--diff-opts <option string>] [--cvs-direct]\n             [--debuglvl <bitmask>] [-Z <compression>] [--root <cvsroot>]\n             [<repository>] [-q]\n\nWhere:\n  -h display this informative message\n  -x ignore (and rebuild) cvsps.cache file\n  -u update cvsps.cache file\n  -z <fuzz> set the timestamp fuzz factor for identifying patch sets\n  -g generate diffs of the selected patch sets\n  -s <patch set>[-[<patch set>]][,<patch set>...] restrict patch sets by id\n  -a <author> restrict output to patch sets created by author\n  -f <file> restrict output to patch sets involving file\n  -d <date1> -d <date2> if just one date specified, show\n     revisions newer than date1.  If two dates specified,\n     show revisions between two dates.\n  -b <branch> restrict output to patch sets affecting history of branch\n  -l <regex> restrict output to patch sets matching <regex> in log message\n  -r <tag1> -r <tag2> if just one tag specified, show\n     revisions since tag1. If two tags specified, show\n     revisions between the two tags.\n  -p <directory> output patch sets to individual files in <directory>\n  -v show very verbose parsing messages\n  -t show some brief memory usage statistics\n  --norc when invoking cvs, ignore the .cvsrc file\n  --summary-first when multiple patch sets are shown, put all summaries first\n  --test-log <captured cvs log> supply a captured cvs log for testing\n  --diff-opts <option string> supply special set of options to diff\n  --bkcvs special hack for parsing the BK -> CVS log format\n  --no-rlog disable rlog (it's faulty in some setups)\n  --cvs-direct (--no-cvs-direct) enable (disable) built-in cvs client code\n  --debuglvl <bitmask> enable various debug channels.\n  -Z <compression> A value 1-9 which specifies amount of compression\n  --root <cvsroot> specify cvsroot.  overrides env. and working directory\n  -q be quiet about warnings\n  <repository> apply cvsps to repository.  overrides working directory\n\ncvsps version 2.0rc1\n\nfatal: refs/heads/origin: not a valid SHA1\nfatal: master: not a valid SHA1\nwarning: You appear to be on a branch yet to be born.\nwarning: Forcing checkout of HEAD.\nfatal: just how do you expect me to merge 0 trees?\ncheckout failed: 256\n* FAIL 3: import a trivial module\n\t\n\t\n\t\tgit cvsimport -a -z 0 -C module-git module &&\n\t\tgit diff module-cvs/o_fortuna module-git/o_fortuna\n\t\n\t\n\n* expecting success: cd module-git && git gc && cd ..\nNothing new to pack.\n*   ok 4: pack refs\n\n* expecting success: \n\n\tcd module-cvs &&\n\tcat <<EOF >o_fortuna &&\nO Fortune,\nlike the moon\nyou are changeable,\n\never waxing\nand waning;\nhateful life\n\nfirst oppresses\nand then soothes\nas fancy takes it;\n\npoverty\nand power\nit melts them like ice.\nEOF\n\tcat <<EOF >message &&\ntranslate to English\n\nMy Latin is terrible.\nEOF\n\tcvs commit -F message &&\n\tcd ..\n\ncvs commit: Examining .\n/home/internet/GIT/git/t/trash/cvsroot/module/o_fortuna,v  <--  o_fortuna\nnew revision: 1.2; previous revision: 1.1\n*   ok 5: update cvs module\n\n* expecting success: \n\n\tcd module-git &&\n\tgit cvsimport -a -z 0 module &&\n\tgit merge origin &&\n\tcd .. &&\n\tgit diff module-cvs/o_fortuna module-git/o_fortuna\n\n\nfatal: Needed a single revision\nBranch 'origin' does not exist.\nEither use the correct '-o branch' option,\nor import to a new repository.\n* FAIL 6: update git module\n\t\n\t\n\t\tcd module-git &&\n\t\tgit cvsimport -a -z 0 module &&\n\t\tgit merge origin &&\n\t\tcd .. &&\n\t\tgit diff module-cvs/o_fortuna module-git/o_fortuna\n\t\n\t\n\n* expecting success: \n\n\tcd module-cvs &&\n\t\techo 1 >tick &&\n\t\tcvs add tick &&\n\t\tcvs commit -m 1\n\tcd ..\n\n\n./test-lib.sh: line 182: cd: module-cvs: No such file or directory\n*   ok 7: update cvs module\n\n* expecting success: \n\n\tcd module-git &&\n\t\tgit config cvsimport.module module &&\n\t\tgit cvsimport -a -z0 &&\n\t\tgit merge origin &&\n\tcd .. &&\n\tgit diff module-cvs/tick module-git/tick\n\n\nfatal: Needed a single revision\nBranch 'origin' does not exist.\nEither use the correct '-o branch' option,\nor import to a new repository.\n* FAIL 8: cvsimport.module config works\n\t\n\t\n\t\tcd module-git &&\n\t\t\tgit config cvsimport.module module &&\n\t\t\tgit cvsimport -a -z0 &&\n\t\t\tgit merge origin &&\n\t\tcd .. &&\n\t\tgit diff module-cvs/tick module-git/tick\n\t\n\t\n\n* failed 3 among 8 test(s)\n"},{"id":"61700","messageId":"Pine.LNX.4.64.0712022340250.27959@racer.site","threadId":"11093","inReplyTo":"47533D75.1090002@gmail.com","subject":"Re: make test failure with latest master","fromName":"Johannes Schindelin","fromEmail":"johannes.schindelin@gmx.de","sentAt":"2007-12-02T23:41:10Z","receivedAt":"2007-12-02T23:41:10Z","isPatch":false,"sender":{"key":"johannes.schindelin@gmx.de","avatar":"https://avatars.githubusercontent.com/u/127790?v=4"},"body":"Hi,\n\nOn Sun, 2 Dec 2007, A Large Angry SCM wrote:\n\n> Jeff King wrote:\n> > On Sun, Dec 02, 2007 at 07:29:50AM -0500, A Large Angry SCM wrote:\n> > \n> > > With the latest master, 2221a6757161af1905925c405aded9ff470f70d5, \"make\n> > > test\" now fails; last successful \"make test\" was mid-week sometime with\n> > > master d25430. This is on a laptop running Suse 9.3.\n> > > \n> > > *** t9600-cvsimport.sh ***\n> > > *   ok 1: setup cvsroot\n> > > *   ok 2: setup a cvs module\n> > > * FAIL 3: import a trivial module\n> > > \n> > > \n> > >                 git cvsimport -a -z 0 -C module-git module &&\n> > >                 git diff module-cvs/o_fortuna module-git/o_fortuna\n> > \n> > Can you please try ./t9600 --verbose? Presumably cvsimport is generating\n> > some kind of error message to tell us what's going on.\n> \n> Attached is the output of\n> \n> \t./t9600-cvsimport.sh --verbose >/tmp/9600_out.txt 2>&1\n> \n\nUnfortunately you attached the interesting part, so I cannot quote it \nhere.  Seems that your cvsps does not understand the \"-A\" option.  So it \nlooks like it is too old.\n\nHth,\nDscho\n"},{"id":"61704","messageId":"20071203015954.GB8322@coredump.intra.peff.net","threadId":"11093","inReplyTo":"Pine.LNX.4.64.0712022340250.27959@racer.site","subject":"Re: make test failure with latest master","fromName":"Jeff King","fromEmail":"peff@peff.net","sentAt":"2007-12-03T01:59:54Z","receivedAt":"2007-12-03T01:59:54Z","isPatch":false,"sender":{"key":"peff@peff.net","avatar":"https://avatars.githubusercontent.com/u/45925?v=4"},"body":"On Sun, Dec 02, 2007 at 11:41:10PM +0000, Johannes Schindelin wrote:\n\n> > Attached is the output of\n> > \n> > \t./t9600-cvsimport.sh --verbose >/tmp/9600_out.txt 2>&1\n> > \n> \n> Unfortunately you attached the interesting part, so I cannot quote it \n> here.  Seems that your cvsps does not understand the \"-A\" option.  So it \n> looks like it is too old.\n\nYes, the changelog indicates that -A was added in 2.1, and he is running\n2.0rc1.\n\nWe can do something like this, though it feels a bit hack-ish and will\nneed updated for new cvsps versions (a less lazy or more clever shell\ncoder than me could do a nice >= version comparator).\n\n-- >8 --\nt9600: require cvsps 2.1 to perform tests\n\ngit-cvsimport won't run at all with less than cvsps 2.1, because it\nlacks the -A flag. But there's no point in preventing people who have an\nold cvsps from running the full testsuite.\n\nSigned-off-by: Jeff King <peff@peff.net>\n---\n\ndiff --git a/t/t9600-cvsimport.sh b/t/t9600-cvsimport.sh\nindex 08f0f2a..c646111 100755\n--- a/t/t9600-cvsimport.sh\n+++ b/t/t9600-cvsimport.sh\n@@ -3,13 +3,29 @@\n test_description='git-cvsimport basic tests'\n . ./test-lib.sh\n \n-if ! ( type cvs && type cvsps ) >/dev/null 2>&1\n+if ! type cvs >/dev/null 2>&1\n then\n-\ttest_expect_success 'skipping cvsimport tests, cvs/cvsps not found' ''\n+\ttest_expect_success 'skipping cvsimport tests, cvs not found' ''\n \ttest_done\n \texit\n fi\n \n+cvsps_version=`cvsps -h 2>&1 | sed -ne 's/cvsps version //p'`\n+case \"$cvsps_version\" in\n+2.1)\n+\t;;\n+'')\n+\ttest_expect_success 'skipping cvsimport tests, cvsps not found' ''\n+\ttest_done\n+\texit\n+\t;;\n+*)\n+\ttest_expect_success 'skipping cvsimport tests, cvsps too old' ''\n+\ttest_done\n+\texit\n+\t;;\n+esac\n+\n CVSROOT=$(pwd)/cvsroot\n export CVSROOT\n # for clean cvsps cache\n"},{"id":"61744","messageId":"4753B147.2050404@viscovery.net","threadId":"11093","inReplyTo":"20071203015954.GB8322@coredump.intra.peff.net","subject":"Re: make test failure with latest master","fromName":"Johannes Sixt","fromEmail":"j.sixt@viscovery.net","sentAt":"2007-12-03T07:33:27Z","receivedAt":"2007-12-03T07:33:27Z","isPatch":false,"sender":{"key":"j6t@kdbg.org","avatar":"https://avatars.githubusercontent.com/u/14810926?v=4"},"body":"Jeff King schrieb:\n> -if ! ( type cvs && type cvsps ) >/dev/null 2>&1\n> +if ! type cvs >/dev/null 2>&1\n>  then\n> -\ttest_expect_success 'skipping cvsimport tests, cvs/cvsps not found' ''\n> +\ttest_expect_success 'skipping cvsimport tests, cvs not found' ''\n\nFWIW, the idiom to provide informative messages in test cases is\n\n\tsay 'skipping cvsimport tests, cvs not found'\n\nThis gives a distinguishing color, too.\n\n-- Hannes\n"},{"id":"61745","messageId":"20071203073553.GA3614@sigill.intra.peff.net","threadId":"11093","inReplyTo":"4753B147.2050404@viscovery.net","subject":"Re: make test failure with latest master","fromName":"Jeff King","fromEmail":"peff@peff.net","sentAt":"2007-12-03T07:35:53Z","receivedAt":"2007-12-03T07:35:53Z","isPatch":false,"sender":{"key":"peff@peff.net","avatar":"https://avatars.githubusercontent.com/u/45925?v=4"},"body":"On Mon, Dec 03, 2007 at 08:33:27AM +0100, Johannes Sixt wrote:\n\n>> -\ttest_expect_success 'skipping cvsimport tests, cvs/cvsps not found' ''\n>> +\ttest_expect_success 'skipping cvsimport tests, cvs not found' ''\n>\n> FWIW, the idiom to provide informative messages in test cases is\n>\n> \tsay 'skipping cvsimport tests, cvs not found'\n>\n> This gives a distinguishing color, too.\n\nAh, I adapted the test from t9400, which uses expect_success. Thanks for\nthe tip.\n\n-Peff\n"},{"id":"61836","messageId":"47548CEC.6010701@gmail.com","threadId":"11093","inReplyTo":"20071203015954.GB8322@coredump.intra.peff.net","subject":"Re: make test failure with latest master","fromName":"A Large Angry SCM","fromEmail":"gitzilla@gmail.com","sentAt":"2007-12-03T23:10:36Z","receivedAt":"2007-12-03T23:10:36Z","isPatch":false,"sender":{"key":"gitzilla@gmail.com","avatar":"https://gravatar.com/avatar/354625c442439908ff3dd99757dee330e29e9df7847472384faf7a00add247fb?d=mp&s=160"},"body":"Jeff King wrote:\n> On Sun, Dec 02, 2007 at 11:41:10PM +0000, Johannes Schindelin wrote:\n> \n>>> Attached is the output of\n>>>\n>>> \t./t9600-cvsimport.sh --verbose >/tmp/9600_out.txt 2>&1\n>>>\n>> Unfortunately you attached the interesting part, so I cannot quote it \n>> here.  Seems that your cvsps does not understand the \"-A\" option.  So it \n>> looks like it is too old.\n\n[Ignoring gitte's declaration that the core of git is dependent on CVS]\n\n> Yes, the changelog indicates that -A was added in 2.1, and he is running\n> 2.0rc1.\n> \n> We can do something like this, though it feels a bit hack-ish and will\n> need updated for new cvsps versions (a less lazy or more clever shell\n> coder than me could do a nice >= version comparator).\n\nThe patch \"fixes\" the issue for me.\n\n> -- >8 --\n> t9600: require cvsps 2.1 to perform tests\n> \n> git-cvsimport won't run at all with less than cvsps 2.1, because it\n> lacks the -A flag. But there's no point in preventing people who have an\n> old cvsps from running the full testsuite.\n> \n> Signed-off-by: Jeff King <peff@peff.net>\n\nAcked-by: A Large Angry SCM <gitzilla@gmail.com>\n"},{"id":"61837","messageId":"7vir3fe54c.fsf@gitster.siamese.dyndns.org","threadId":"11093","inReplyTo":"47548CEC.6010701@gmail.com","subject":"Re: make test failure with latest master","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2007-12-03T23:21:55Z","receivedAt":"2007-12-03T23:21:55Z","isPatch":false,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"A Large Angry SCM <gitzilla@gmail.com> writes:\n\n> Jeff King wrote:\n>> On Sun, Dec 02, 2007 at 11:41:10PM +0000, Johannes Schindelin wrote:\n>>\n>>>> Attached is the output of\n>>>>\n>>>> \t./t9600-cvsimport.sh --verbose >/tmp/9600_out.txt 2>&1\n>>>>\n>>> Unfortunately you attached the interesting part, so I cannot quote\n>>> it here.  Seems that your cvsps does not understand the \"-A\"\n>>> option.  So it looks like it is too old.\n>\n> [Ignoring gitte's declaration that the core of git is dependent on CVS]\n>\n>> Yes, the changelog indicates that -A was added in 2.1, and he is running\n>> 2.0rc1.\n>>\n>> We can do something like this, though it feels a bit hack-ish and will\n>> need updated for new cvsps versions (a less lazy or more clever shell\n>> coder than me could do a nice >= version comparator).\n>\n> The patch \"fixes\" the issue for me.\n>\n>> -- >8 --\n>> t9600: require cvsps 2.1 to perform tests\n>>\n>> git-cvsimport won't run at all with less than cvsps 2.1, because it\n>> lacks the -A flag. But there's no point in preventing people who have an\n>> old cvsps from running the full testsuite.\n>>\n>> Signed-off-by: Jeff King <peff@peff.net>\n>\n> Acked-by: A Large Angry SCM <gitzilla@gmail.com>\n\nIt would be Tested-by: in a stricter sense of the word but thanks for\ntesting.\n\nJeff, would you want to further amend the patch to use \"say\" as Hannes\nsuggested to make it look nicer?\n"},{"id":"61838","messageId":"47549079.60400@gmail.com","threadId":"11093","inReplyTo":"7vir3fe54c.fsf@gitster.siamese.dyndns.org","subject":"Re: make test failure with latest master","fromName":"A Large Angry SCM","fromEmail":"gitzilla@gmail.com","sentAt":"2007-12-03T23:25:45Z","receivedAt":"2007-12-03T23:25:45Z","isPatch":false,"sender":{"key":"gitzilla@gmail.com","avatar":"https://gravatar.com/avatar/354625c442439908ff3dd99757dee330e29e9df7847472384faf7a00add247fb?d=mp&s=160"},"body":"Junio C Hamano wrote:\n> A Large Angry SCM <gitzilla@gmail.com> writes:\n[...]\n>> Acked-by: A Large Angry SCM <gitzilla@gmail.com>\n> \n> It would be Tested-by: in a stricter sense of the word but thanks for\n> testing.\n\nTested-by: A Large Angry SCM <gitzilla@gmail.com>\n"},{"id":"61848","messageId":"20071204014145.GA20145@coredump.intra.peff.net","threadId":"11093","inReplyTo":"7vir3fe54c.fsf@gitster.siamese.dyndns.org","subject":"[PATCH] t9600: require cvsps 2.1 to perform tests","fromName":"Jeff King","fromEmail":"peff@peff.net","sentAt":"2007-12-04T01:41:45Z","receivedAt":"2007-12-04T01:41:45Z","isPatch":true,"sender":{"key":"peff@peff.net","avatar":"https://avatars.githubusercontent.com/u/45925?v=4"},"body":"git-cvsimport won't run at all with less than cvsps 2.1, because it\nlacks the -A flag. But there's no point in preventing people who have an\nold cvsps from running the full testsuite.\n\nTested-by: A Large Angry SCM <gitzilla@gmail.com>\nSigned-off-by: Jeff King <peff@peff.net>\n---\nOn Mon, Dec 03, 2007 at 03:21:55PM -0800, Junio C Hamano wrote:\n\n> Jeff, would you want to further amend the patch to use \"say\" as Hannes\n> suggested to make it look nicer?\n\nHere it is.\n\n t/t9600-cvsimport.sh |   20 ++++++++++++++++++--\n 1 files changed, 18 insertions(+), 2 deletions(-)\n\ndiff --git a/t/t9600-cvsimport.sh b/t/t9600-cvsimport.sh\nindex 08f0f2a..7706430 100755\n--- a/t/t9600-cvsimport.sh\n+++ b/t/t9600-cvsimport.sh\n@@ -3,13 +3,29 @@\n test_description='git-cvsimport basic tests'\n . ./test-lib.sh\n \n-if ! ( type cvs && type cvsps ) >/dev/null 2>&1\n+if ! type cvs >/dev/null 2>&1\n then\n-\ttest_expect_success 'skipping cvsimport tests, cvs/cvsps not found' ''\n+\tsay 'skipping cvsimport tests, cvs not found'\n \ttest_done\n \texit\n fi\n \n+cvsps_version=`cvsps -h 2>&1 | sed -ne 's/cvsps version //p'`\n+case \"$cvsps_version\" in\n+2.1)\n+\t;;\n+'')\n+\tsay 'skipping cvsimport tests, cvsps not found'\n+\ttest_done\n+\texit\n+\t;;\n+*)\n+\tsay 'skipping cvsimport tests, cvsps too old'\n+\ttest_done\n+\texit\n+\t;;\n+esac\n+\n CVSROOT=$(pwd)/cvsroot\n export CVSROOT\n # for clean cvsps cache\n-- \n1.5.3.7.2070.g88cf2-dirty\n"},{"id":"61865","messageId":"7v1wa3aukt.fsf@gitster.siamese.dyndns.org","threadId":"11093","inReplyTo":"20071204014145.GA20145@coredump.intra.peff.net","subject":"Re: [PATCH] t9600: require cvsps 2.1 to perform tests","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2007-12-04T05:37:54Z","receivedAt":"2007-12-04T05:37:54Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Jeff King <peff@peff.net> writes:\n\n> +cvsps_version=`cvsps -h 2>&1 | sed -ne 's/cvsps version //p'`\n> +case \"$cvsps_version\" in\n> +2.1)\n> +\t;;\n> +'')\n> +\tsay 'skipping cvsimport tests, cvsps not found'\n> +\ttest_done\n> +\texit\n> +\t;;\n> +*)\n> +\tsay 'skipping cvsimport tests, cvsps too old'\n> +\ttest_done\n> +\texit\n> +\t;;\n> +esac\n> +\n\nI wonder if it is better to grep for ' [-A] ' instead, like:\n\ncvsps_supports_A=$(cvsps -h 2>&1 | sed -ne '/\\[-A\\]/p')\ncase \"$cvsps_supports_A\" in\n'')\n\tsay 'skipping cvsimport tests, lacking cvsps that supports -A option'\n\ttest_done\n        exit\nesac\n"},{"id":"61919","messageId":"20071204154454.GA2994@coredump.intra.peff.net","threadId":"11093","inReplyTo":"7v1wa3aukt.fsf@gitster.siamese.dyndns.org","subject":"Re: [PATCH] t9600: require cvsps 2.1 to perform tests","fromName":"Jeff King","fromEmail":"peff@peff.net","sentAt":"2007-12-04T15:44:54Z","receivedAt":"2007-12-04T15:44:54Z","isPatch":true,"sender":{"key":"peff@peff.net","avatar":"https://avatars.githubusercontent.com/u/45925?v=4"},"body":"On Mon, Dec 03, 2007 at 09:37:54PM -0800, Junio C Hamano wrote:\n\n> I wonder if it is better to grep for ' [-A] ' instead, like:\n> \n> cvsps_supports_A=$(cvsps -h 2>&1 | sed -ne '/\\[-A\\]/p')\n> case \"$cvsps_supports_A\" in\n> '')\n> \tsay 'skipping cvsimport tests, lacking cvsps that supports -A option'\n> \ttest_done\n>         exit\n> esac\n\nI am not too opposed to that, but I felt that checking the version was a\nlittle bit more future proof. I.e., I have no idea if it is only -A that\nwe need, but I know that 2.1 works and prior to 2.1 doesn't.\n\n-Jeff\n"},{"id":"61927","messageId":"7vhciy5pg0.fsf@gitster.siamese.dyndns.org","threadId":"11093","inReplyTo":"20071204154454.GA2994@coredump.intra.peff.net","subject":"Re: [PATCH] t9600: require cvsps 2.1 to perform tests","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2007-12-04T17:39:59Z","receivedAt":"2007-12-04T17:39:59Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Jeff King <peff@peff.net> writes:\n\n> On Mon, Dec 03, 2007 at 09:37:54PM -0800, Junio C Hamano wrote:\n>\n>> I wonder if it is better to grep for ' [-A] ' instead, like:\n>> \n>> cvsps_supports_A=$(cvsps -h 2>&1 | sed -ne '/\\[-A\\]/p')\n>> case \"$cvsps_supports_A\" in\n>> '')\n>> \tsay 'skipping cvsimport tests, lacking cvsps that supports -A option'\n>> \ttest_done\n>>         exit\n>> esac\n>\n> I am not too opposed to that, but I felt that checking the version was a\n> little bit more future proof. I.e., I have no idea if it is only -A that\n> we need, but I know that 2.1 works and prior to 2.1 doesn't.\n\nYou are right about \"we may be depending on what 2.1 has other than\n-A\".  Will apply as-is.\n\nThanks, both.\n\nThe primary reason I asked about '\\[-A\\]' was what will happen if\nsomebody uses 2.2.\n"},{"id":"61959","messageId":"20071205010202.GA4713@coredump.intra.peff.net","threadId":"11093","inReplyTo":"7vhciy5pg0.fsf@gitster.siamese.dyndns.org","subject":"Re: [PATCH] t9600: require cvsps 2.1 to perform tests","fromName":"Jeff King","fromEmail":"peff@peff.net","sentAt":"2007-12-05T01:02:02Z","receivedAt":"2007-12-05T01:02:02Z","isPatch":true,"sender":{"key":"peff@peff.net","avatar":"https://avatars.githubusercontent.com/u/45925?v=4"},"body":"On Tue, Dec 04, 2007 at 09:39:59AM -0800, Junio C Hamano wrote:\n\n> You are right about \"we may be depending on what 2.1 has other than\n> -A\".  Will apply as-is.\n> \n> Thanks, both.\n> \n> The primary reason I asked about '\\[-A\\]' was what will happen if\n> somebody uses 2.2.\n\nYes, it would be nice to be able to easily check >2.1. GNU expr seems to\nhandle this ok:\n\n  $ expr 2.2 '>' 2.1\n  1\n  $ expr 2.0 '>' 2.1\n  0\n\nbut POSIX seems to mention only integers and string comparison (though\nif all are of the form \"x.y\", string comparison works). I have no idea\nhow portable this is.\n\n-Peff\n"},{"id":"61963","messageId":"7v3auh3dbt.fsf@gitster.siamese.dyndns.org","threadId":"11093","inReplyTo":"20071205010202.GA4713@coredump.intra.peff.net","subject":"Re: [PATCH] t9600: require cvsps 2.1 to perform tests","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2007-12-05T05:44:38Z","receivedAt":"2007-12-05T05:44:38Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Jeff King <peff@peff.net> writes:\n\n> On Tue, Dec 04, 2007 at 09:39:59AM -0800, Junio C Hamano wrote:\n>\n>> You are right about \"we may be depending on what 2.1 has other than\n>> -A\".  Will apply as-is.\n>> \n>> Thanks, both.\n>> \n>> The primary reason I asked about '\\[-A\\]' was what will happen if\n>> somebody uses 2.2.\n>\n> Yes, it would be nice to be able to easily check >2.1. GNU expr seems to\n> handle this ok:\n>\n>   $ expr 2.2 '>' 2.1\n>   1\n>   $ expr 2.0 '>' 2.1\n>   0\n>\n> but POSIX seems to mention only integers and string comparison (though\n> if all are of the form \"x.y\", string comparison works). I have no idea\n> how portable this is.\n\nYeah, but it is the same thing -- we know 2.1 works, we do not know if\n2.2 will break things for us ;-)\n\nWe'll worry about it when somebody with 2.2 complains.\n"}]}