{"thread":{"id":"36876","subject":"[PATCH 1/7] test: turn EXPENSIVE into a lazy prerequisite","startedAt":"2014-06-09T23:22:48Z","lastAt":"2014-06-13T07:45:12Z","messageCount":9,"participants":["Junio C Hamano","Jeff King"],"isPatch":true,"patchVersion":1,"patchTotal":7},"messages":[{"id":"243681","messageId":"1402356175-7249-1-git-send-email-gitster@pobox.com","threadId":"36876","inReplyTo":null,"subject":"[PATCH 0/7] A few minor test-prereq updates","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2014-06-09T23:22:48Z","receivedAt":"2014-06-09T23:22:48Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"While reviewing somebody's patch, I noticed that individual test\nscripts set EXPENSIVE test prerequisite with copied-and-pasted\nlines.  Here is a bit to update them, while fixing styles in old\ntest scripts that had these copied-and-pasted lines.\n\nThe last step discards support for GIT_{NOTES,PATCHID}_TIMING_TESTS\nenvironment variables to enable EXPENSIVE tests in two test scripts,\nwhich *is* a backward incompatible change and people may want to\nargue against it (but I of course thought it is a good change and\nthat is why it is included).\n\nJunio C Hamano (7):\n  test: turn EXPENSIVE into a lazy prerequisite\n  test: turn USR_BIN_TIME into a lazy prerequisite\n  t3302: coding style updates\n  t3302: do not chdir around in the primary test process\n  t3302: drop unnecessary NOT_EXPENSIVE pseudo-prerequisite\n  t3419: drop unnecessary NOT_EXPENSIVE pseudo-prerequisite\n  tests: drop GIT_*_TIMING_TESTS environment variable support\n\n t/t0021-conversion.sh            |   2 -\n t/t3302-notes-index-expensive.sh | 130 +++++++++++++++++++++------------------\n t/t3419-rebase-patch-id.sh       |  25 +++-----\n t/t5551-http-fetch.sh            |   2 -\n t/test-lib.sh                    |   8 +++\n 5 files changed, 85 insertions(+), 82 deletions(-)\n\n-- \n2.0.0-435-g307a092\n"},{"id":"243675","messageId":"1402356175-7249-2-git-send-email-gitster@pobox.com","threadId":"36876","inReplyTo":"1402356175-7249-1-git-send-email-gitster@pobox.com","subject":"[PATCH 1/7] test: turn EXPENSIVE into a lazy prerequisite","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2014-06-09T23:22:49Z","receivedAt":"2014-06-09T23:22:49Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Two test scripts (t0021 and t5551) had copy & paste code to set\nEXPENSIVE prerequisite.  Use the test_lazy_prereq helper to define\nthem in the common t/test-lib.sh.\n\nSigned-off-by: Junio C Hamano <gitster@pobox.com>\n---\n t/t0021-conversion.sh | 2 --\n t/t5551-http-fetch.sh | 2 --\n t/test-lib.sh         | 4 ++++\n 3 files changed, 4 insertions(+), 4 deletions(-)\n\ndiff --git a/t/t0021-conversion.sh b/t/t0021-conversion.sh\nindex b92e6cb..f890c54 100755\n--- a/t/t0021-conversion.sh\n+++ b/t/t0021-conversion.sh\n@@ -190,8 +190,6 @@ test_expect_success 'required filter clean failure' '\n \ttest_must_fail git add test.fc\n '\n \n-test -n \"$GIT_TEST_LONG\" && test_set_prereq EXPENSIVE\n-\n test_expect_success EXPENSIVE 'filter large file' '\n \tgit config filter.largefile.smudge cat &&\n \tgit config filter.largefile.clean cat &&\ndiff --git a/t/t5551-http-fetch.sh b/t/t5551-http-fetch.sh\nindex afb439e..d697393 100755\n--- a/t/t5551-http-fetch.sh\n+++ b/t/t5551-http-fetch.sh\n@@ -214,8 +214,6 @@ test_expect_success 'cookies stored in http.cookiefile when http.savecookies set\n \ttest_cmp expect_cookies.txt cookies_tail.txt\n '\n \n-test -n \"$GIT_TEST_LONG\" && test_set_prereq EXPENSIVE\n-\n test_expect_success EXPENSIVE 'create 50,000 tags in the repo' '\n \t(\n \tcd \"$HTTPD_DOCUMENT_ROOT_PATH/repo.git\" &&\ndiff --git a/t/test-lib.sh b/t/test-lib.sh\nindex b25249e..d70d05e 100644\n--- a/t/test-lib.sh\n+++ b/t/test-lib.sh\n@@ -855,6 +855,10 @@ test_lazy_prereq AUTOIDENT '\n \tgit var GIT_AUTHOR_IDENT\n '\n \n+test_lazy_prereq EXPENSIVE '\n+\ttest -n \"$GIT_TEST_LONG\"\n+'\n+\n # When the tests are run as root, permission tests will report that\n # things are writable when they shouldn't be.\n test -w / || test_set_prereq SANITY\n-- \n2.0.0-435-g307a092\n"},{"id":"243676","messageId":"1402356175-7249-3-git-send-email-gitster@pobox.com","threadId":"36876","inReplyTo":"1402356175-7249-1-git-send-email-gitster@pobox.com","subject":"[PATCH 2/7] test: turn USR_BIN_TIME into a lazy prerequisite","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2014-06-09T23:22:50Z","receivedAt":"2014-06-09T23:22:50Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Two test scripts (t3302 and t3419) had copy & paste code to set\nUSR_BIN_TIME prerequisite.  Use the test_lazy_prereq helper to define\nthem in the common t/test-lib.sh.\n\nSigned-off-by: Junio C Hamano <gitster@pobox.com>\n---\n t/t3302-notes-index-expensive.sh | 1 -\n t/t3419-rebase-patch-id.sh       | 1 -\n t/test-lib.sh                    | 4 ++++\n 3 files changed, 4 insertions(+), 2 deletions(-)\n\ndiff --git a/t/t3302-notes-index-expensive.sh b/t/t3302-notes-index-expensive.sh\nindex e35d781..dc706ab 100755\n--- a/t/t3302-notes-index-expensive.sh\n+++ b/t/t3302-notes-index-expensive.sh\n@@ -9,7 +9,6 @@ test_description='Test commit notes index (expensive!)'\n \n test_set_prereq NOT_EXPENSIVE\n test -n \"$GIT_NOTES_TIMING_TESTS\" && test_set_prereq EXPENSIVE\n-test -x /usr/bin/time && test_set_prereq USR_BIN_TIME\n \n create_repo () {\n \tnumber_of_commits=$1\ndiff --git a/t/t3419-rebase-patch-id.sh b/t/t3419-rebase-patch-id.sh\nindex e70ac10..08e30b3 100755\n--- a/t/t3419-rebase-patch-id.sh\n+++ b/t/t3419-rebase-patch-id.sh\n@@ -6,7 +6,6 @@ test_description='git rebase - test patch id computation'\n \n test_set_prereq NOT_EXPENSIVE\n test -n \"$GIT_PATCHID_TIMING_TESTS\" && test_set_prereq EXPENSIVE\n-test -x /usr/bin/time && test_set_prereq USR_BIN_TIME\n \n count()\n {\ndiff --git a/t/test-lib.sh b/t/test-lib.sh\nindex d70d05e..884c57c 100644\n--- a/t/test-lib.sh\n+++ b/t/test-lib.sh\n@@ -859,6 +859,10 @@ test_lazy_prereq EXPENSIVE '\n \ttest -n \"$GIT_TEST_LONG\"\n '\n \n+test_lazy_prereq USR_BIN_TIME '\n+\ttest -x /usr/bin/time\n+'\n+\n # When the tests are run as root, permission tests will report that\n # things are writable when they shouldn't be.\n test -w / || test_set_prereq SANITY\n-- \n2.0.0-435-g307a092\n"},{"id":"243677","messageId":"1402356175-7249-4-git-send-email-gitster@pobox.com","threadId":"36876","inReplyTo":"1402356175-7249-1-git-send-email-gitster@pobox.com","subject":"[PATCH 3/7] t3302: coding style updates","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2014-06-09T23:22:51Z","receivedAt":"2014-06-09T23:22:51Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Use \"<<-END_OF_HERE_TEXT\" to push the contents of here-text to the\nright in order to show the loop structure better.\n\nUse write_script when writing a script to be run.\n\nUse \"test\" (not \"[ ... ]\") and avoid unnecessary \";\" in the middle\nof a line.\n\nSigned-off-by: Junio C Hamano <gitster@pobox.com>\n---\n t/t3302-notes-index-expensive.sh | 90 +++++++++++++++++++++-------------------\n 1 file changed, 47 insertions(+), 43 deletions(-)\n\ndiff --git a/t/t3302-notes-index-expensive.sh b/t/t3302-notes-index-expensive.sh\nindex dc706ab..aa9dbd7 100755\n--- a/t/t3302-notes-index-expensive.sh\n+++ b/t/t3302-notes-index-expensive.sh\n@@ -16,43 +16,43 @@ create_repo () {\n \ttest -d .git || {\n \tgit init &&\n \t(\n-\t\twhile [ $nr -lt $number_of_commits ]; do\n+\t\twhile test $nr -lt $number_of_commits\n+\t\tdo\n \t\t\tnr=$(($nr+1))\n \t\t\tmark=$(($nr+$nr))\n \t\t\tnotemark=$(($mark+1))\n \t\t\ttest_tick &&\n-\t\t\tcat <<INPUT_END &&\n-commit refs/heads/master\n-mark :$mark\n-committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE\n-data <<COMMIT\n-commit #$nr\n-COMMIT\n-\n-M 644 inline file\n-data <<EOF\n-file in commit #$nr\n-EOF\n-\n-blob\n-mark :$notemark\n-data <<EOF\n-note for commit #$nr\n-EOF\n-\n-INPUT_END\n-\n-\t\t\techo \"N :$notemark :$mark\" >> note_commit\n+\t\t\tcat <<-INPUT_END &&\n+\t\t\tcommit refs/heads/master\n+\t\t\tmark :$mark\n+\t\t\tcommitter $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE\n+\t\t\tdata <<COMMIT\n+\t\t\tcommit #$nr\n+\t\t\tCOMMIT\n+\n+\t\t\tM 644 inline file\n+\t\t\tdata <<EOF\n+\t\t\tfile in commit #$nr\n+\t\t\tEOF\n+\n+\t\t\tblob\n+\t\t\tmark :$notemark\n+\t\t\tdata <<EOF\n+\t\t\tnote for commit #$nr\n+\t\t\tEOF\n+\n+\t\t\tINPUT_END\n+\t\t\techo \"N :$notemark :$mark\" >>note_commit\n \t\tdone &&\n \t\ttest_tick &&\n-\t\tcat <<INPUT_END &&\n-commit refs/notes/commits\n-committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE\n-data <<COMMIT\n-notes\n-COMMIT\n+\t\tcat <<-INPUT_END &&\n+\t\tcommit refs/notes/commits\n+\t\tcommitter $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE\n+\t\tdata <<COMMIT\n+\t\tnotes\n+\t\tCOMMIT\n \n-INPUT_END\n+\t\tINPUT_END\n \n \t\tcat note_commit\n \t) |\n@@ -64,38 +64,41 @@ INPUT_END\n test_notes () {\n \tcount=$1 &&\n \tgit config core.notesRef refs/notes/commits &&\n-\tgit log | grep \"^    \" > output &&\n+\tgit log | grep \"^    \" >output &&\n \ti=$count &&\n-\twhile [ $i -gt 0 ]; do\n+\twhile test $i -gt 0\n+\tdo\n \t\techo \"    commit #$i\" &&\n \t\techo \"    note for commit #$i\" &&\n-\t\ti=$(($i-1));\n-\tdone > expect &&\n+\t\ti=$(($i-1))\n+\tdone >expect &&\n \ttest_cmp expect output\n }\n \n-cat > time_notes << \\EOF\n+write_script time_notes <<\\EOF\n \tmode=$1\n \ti=1\n-\twhile [ $i -lt $2 ]; do\n+\twhile test $i -lt $2\n+\tdo\n \t\tcase $1 in\n \t\tno-notes)\n-\t\t\tGIT_NOTES_REF=non-existing; export GIT_NOTES_REF\n-\t\t;;\n+\t\t\tGIT_NOTES_REF=non-existing\n+\t\t\texport GIT_NOTES_REF\n+\t\t\t;;\n \t\tnotes)\n \t\t\tunset GIT_NOTES_REF\n-\t\t;;\n+\t\t\t;;\n \t\tesac\n-\t\tgit log >/dev/null\n+\t\tgit log\n \t\ti=$(($i+1))\n-\tdone\n+\tdone >/dev/null\n EOF\n \n time_notes () {\n \tfor mode in no-notes notes\n \tdo\n \t\techo $mode\n-\t\t/usr/bin/time \"$SHELL_PATH\" ../time_notes $mode $1\n+\t\t/usr/bin/time ../time_notes $mode $1\n \tdone\n }\n \n@@ -118,7 +121,8 @@ do_tests () {\n }\n \n do_tests NOT_EXPENSIVE 10\n-for count in 100 1000 10000; do\n+for count in 100 1000 10000\n+do\n \tdo_tests EXPENSIVE $count\n done\n \n-- \n2.0.0-435-g307a092\n"},{"id":"243679","messageId":"1402356175-7249-5-git-send-email-gitster@pobox.com","threadId":"36876","inReplyTo":"1402356175-7249-1-git-send-email-gitster@pobox.com","subject":"[PATCH 4/7] t3302: do not chdir around in the primary test process","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2014-06-09T23:22:52Z","receivedAt":"2014-06-09T23:22:52Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"These days^Wyears we strive to do stuff in subdirectories inside\nsubshells to avoid mistakes.\n\nSigned-off-by: Junio C Hamano <gitster@pobox.com>\n---\n t/t3302-notes-index-expensive.sh | 27 ++++++++++++++++++---------\n 1 file changed, 18 insertions(+), 9 deletions(-)\n\ndiff --git a/t/t3302-notes-index-expensive.sh b/t/t3302-notes-index-expensive.sh\nindex aa9dbd7..7712cf3 100755\n--- a/t/t3302-notes-index-expensive.sh\n+++ b/t/t3302-notes-index-expensive.sh\n@@ -106,18 +106,27 @@ do_tests () {\n \tpr=$1\n \tcount=$2\n \n-\ttest_expect_success $pr 'setup / mkdir' '\n-\t\tmkdir $count &&\n-\t\tcd $count\n+\ttest_expect_success $pr \"setup $count\" '\n+\t\tmkdir \"$count\" &&\n+\t\t(\n+\t\t\tcd \"$count\" &&\n+\t\t\tcreate_repo \"$count\"\n+\t\t)\n \t'\n \n-\ttest_expect_success $pr \"setup $count\" \"create_repo $count\"\n-\n-\ttest_expect_success $pr 'notes work' \"test_notes $count\"\n-\n-\ttest_expect_success USR_BIN_TIME,$pr 'notes timing with /usr/bin/time' \"time_notes 100\"\n+\ttest_expect_success $pr 'notes work' '\n+\t\t(\n+\t\t\tcd \"$count\" &&\n+\t\t\ttest_notes \"$count\"\n+\t\t)\n+\t'\n \n-\ttest_expect_success $pr 'teardown / cd ..' 'cd ..'\n+\ttest_expect_success USR_BIN_TIME,$pr 'notes timing with /usr/bin/time' '\n+\t\t(\n+\t\t\tcd \"$count\" &&\n+\t\t\ttime_notes 100\n+\t\t)\n+\t'\n }\n \n do_tests NOT_EXPENSIVE 10\n-- \n2.0.0-435-g307a092\n"},{"id":"243680","messageId":"1402356175-7249-6-git-send-email-gitster@pobox.com","threadId":"36876","inReplyTo":"1402356175-7249-1-git-send-email-gitster@pobox.com","subject":"[PATCH 5/7] t3302: drop unnecessary NOT_EXPENSIVE pseudo-prerequisite","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2014-06-09T23:22:53Z","receivedAt":"2014-06-09T23:22:53Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"This was only necessary because do_tests helper the script defines\ntook its parameters in a wrong order.  Just pass an empty string (or\nnot passing the optional EXPENSIVE prerequisite) when running the\ntest with a light-weight set of parameters and have the shell do the\nright thing when parsing test_expect_success helper.\n\nSigned-off-by: Junio C Hamano <gitster@pobox.com>\n---\n t/t3302-notes-index-expensive.sh | 10 ++++------\n 1 file changed, 4 insertions(+), 6 deletions(-)\n\ndiff --git a/t/t3302-notes-index-expensive.sh b/t/t3302-notes-index-expensive.sh\nindex 7712cf3..8d44e04 100755\n--- a/t/t3302-notes-index-expensive.sh\n+++ b/t/t3302-notes-index-expensive.sh\n@@ -7,7 +7,6 @@ test_description='Test commit notes index (expensive!)'\n \n . ./test-lib.sh\n \n-test_set_prereq NOT_EXPENSIVE\n test -n \"$GIT_NOTES_TIMING_TESTS\" && test_set_prereq EXPENSIVE\n \n create_repo () {\n@@ -103,8 +102,7 @@ time_notes () {\n }\n \n do_tests () {\n-\tpr=$1\n-\tcount=$2\n+\tcount=$1 pr=${2-}\n \n \ttest_expect_success $pr \"setup $count\" '\n \t\tmkdir \"$count\" &&\n@@ -121,7 +119,7 @@ do_tests () {\n \t\t)\n \t'\n \n-\ttest_expect_success USR_BIN_TIME,$pr 'notes timing with /usr/bin/time' '\n+\ttest_expect_success \"USR_BIN_TIME${pr:+,$pr}\" 'notes timing with /usr/bin/time' '\n \t\t(\n \t\t\tcd \"$count\" &&\n \t\t\ttime_notes 100\n@@ -129,10 +127,10 @@ do_tests () {\n \t'\n }\n \n-do_tests NOT_EXPENSIVE 10\n+do_tests 10\n for count in 100 1000 10000\n do\n-\tdo_tests EXPENSIVE $count\n+\tdo_tests \"$count\" EXPENSIVE\n done\n \n test_done\n-- \n2.0.0-435-g307a092\n"},{"id":"243682","messageId":"1402356175-7249-7-git-send-email-gitster@pobox.com","threadId":"36876","inReplyTo":"1402356175-7249-1-git-send-email-gitster@pobox.com","subject":"[PATCH 6/7] t3419: drop unnecessary NOT_EXPENSIVE pseudo-prerequisite","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2014-06-09T23:22:54Z","receivedAt":"2014-06-09T23:22:54Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"This was only necessary because do_tests helper the script defines\ntook its parameters in a wrong order.  Just pass an empty string (or\nnot passing the optional EXPENSIVE prerequisite) when running the\ntest with a light-weight set of parameters and have the shell do the\nright thing when parsing test_expect_success helper.\n\nAlso update coding style while we are at it.\n\nSigned-off-by: Junio C Hamano <gitster@pobox.com>\n---\n t/t3419-rebase-patch-id.sh | 22 ++++++++--------------\n 1 file changed, 8 insertions(+), 14 deletions(-)\n\ndiff --git a/t/t3419-rebase-patch-id.sh b/t/t3419-rebase-patch-id.sh\nindex 08e30b3..9292b49 100755\n--- a/t/t3419-rebase-patch-id.sh\n+++ b/t/t3419-rebase-patch-id.sh\n@@ -4,11 +4,9 @@ test_description='git rebase - test patch id computation'\n \n . ./test-lib.sh\n \n-test_set_prereq NOT_EXPENSIVE\n test -n \"$GIT_PATCHID_TIMING_TESTS\" && test_set_prereq EXPENSIVE\n \n-count()\n-{\n+count () {\n \ti=0\n \twhile test $i -lt $1\n \tdo\n@@ -17,8 +15,7 @@ count()\n \tdone\n }\n \n-scramble()\n-{\n+scramble () {\n \ti=0\n \twhile read x\n \tdo\n@@ -27,12 +24,11 @@ scramble()\n \t\t\techo \"$x\"\n \t\tfi\n \t\ti=$((($i+1) % 10))\n-\tdone < \"$1\" > \"$1.new\"\n+\tdone <\"$1\" >\"$1.new\"\n \tmv -f \"$1.new\" \"$1\"\n }\n \n-run()\n-{\n+run () {\n \techo \\$ \"$@\"\n \t/usr/bin/time \"$@\" >/dev/null\n }\n@@ -42,10 +38,8 @@ test_expect_success 'setup' '\n \tgit tag root\n '\n \n-do_tests()\n-{\n-\tpr=$1\n-\tnlines=$2\n+do_tests () {\n+\tnlines=$1 pr=${2-}\n \n \ttest_expect_success $pr \"setup: $nlines lines\" \"\n \t\trm -f .gitattributes &&\n@@ -102,7 +96,7 @@ do_tests()\n \t\"\n }\n \n-do_tests NOT_EXPENSIVE 500\n-do_tests EXPENSIVE 50000\n+do_tests 500\n+do_tests 50000 EXPENSIVE\n \n test_done\n-- \n2.0.0-435-g307a092\n"},{"id":"243683","messageId":"1402356175-7249-8-git-send-email-gitster@pobox.com","threadId":"36876","inReplyTo":"1402356175-7249-1-git-send-email-gitster@pobox.com","subject":"[PATCH 7/7] tests: drop GIT_*_TIMING_TESTS environment variable support","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2014-06-09T23:22:55Z","receivedAt":"2014-06-09T23:22:55Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Two tests (t3302 and t3419) used to have their own environment\nvariable to trigger expensive tests without enabling expensive\ntests in other scripts; a user could set GIT_NOTES_TIMING_TESTS\nbut not GIT_TEST_LONG and run the whole test suite and trigger\nexpensive tests only in t3302 but not other tests.  The same for\nGIT_PATCHID_TIMING_TESTS in t3419.\n\nWhile this may have seemed a good flexibility, in reality if you are\nconcentrating on a single test (e.g. t3302), you can just run that\nsingle test with the GIT_TEST_LONG to trigger expensive tests.  It\ndoes not seem worth forcing other people who may want to come up\nwith their own expesive tests to invent new environment variables by\nkeeping this convention.\n\nDrop them.\n\nSigned-off-by: Junio C Hamano <gitster@pobox.com>\n---\n t/t3302-notes-index-expensive.sh | 2 --\n t/t3419-rebase-patch-id.sh       | 2 --\n 2 files changed, 4 deletions(-)\n\ndiff --git a/t/t3302-notes-index-expensive.sh b/t/t3302-notes-index-expensive.sh\nindex 8d44e04..7217c5e 100755\n--- a/t/t3302-notes-index-expensive.sh\n+++ b/t/t3302-notes-index-expensive.sh\n@@ -7,8 +7,6 @@ test_description='Test commit notes index (expensive!)'\n \n . ./test-lib.sh\n \n-test -n \"$GIT_NOTES_TIMING_TESTS\" && test_set_prereq EXPENSIVE\n-\n create_repo () {\n \tnumber_of_commits=$1\n \tnr=0\ndiff --git a/t/t3419-rebase-patch-id.sh b/t/t3419-rebase-patch-id.sh\nindex 9292b49..217dd79 100755\n--- a/t/t3419-rebase-patch-id.sh\n+++ b/t/t3419-rebase-patch-id.sh\n@@ -4,8 +4,6 @@ test_description='git rebase - test patch id computation'\n \n . ./test-lib.sh\n \n-test -n \"$GIT_PATCHID_TIMING_TESTS\" && test_set_prereq EXPENSIVE\n-\n count () {\n \ti=0\n \twhile test $i -lt $1\n-- \n2.0.0-435-g307a092\n"},{"id":"244066","messageId":"20140613074512.GG7908@sigill.intra.peff.net","threadId":"36876","inReplyTo":"1402356175-7249-3-git-send-email-gitster@pobox.com","subject":"Re: [PATCH 2/7] test: turn USR_BIN_TIME into a lazy prerequisite","fromName":"Jeff King","fromEmail":"peff@peff.net","sentAt":"2014-06-13T07:45:12Z","receivedAt":"2014-06-13T07:45:12Z","isPatch":true,"sender":{"key":"peff@peff.net","avatar":"https://avatars.githubusercontent.com/u/45925?v=4"},"body":"On Mon, Jun 09, 2014 at 04:22:50PM -0700, Junio C Hamano wrote:\n\n> Two test scripts (t3302 and t3419) had copy & paste code to set\n> USR_BIN_TIME prerequisite.  Use the test_lazy_prereq helper to define\n> them in the common t/test-lib.sh.\n\nI have to wonder why we even have such a prereq in the first place.\n\nMany tests which use EXPENSIVE are sensible; we used to do something bad\nwith large values, we fixed it, and want to be able to test the\ncorrectness of the fix. The use in t0021 looks like that.\n\nHowever, the tests in t3302 and t3419, which use both EXPENSIVE and\nUSR_BIN_TIME, seem like they are really interested in performance\ntesting. I think they probably should be in t/perf in the first place\n(the reason they are not is presumably because they predate it).\n\nOther than that, your series looks fine.\n\n-Peff\n\nPS s/expesive/expensive/ in the commit message of 7/7\n"}]}