From: Junio C Hamano Date: Thu, 7 Jul 2005 18:39:10 +0000 (-0700) Subject: [PATCH] Prevent t6000 series from dropping useless sed.script in t/ X-Git-Tag: v0.99~33 X-Git-Url: https://git.verplant.org/?a=commitdiff_plain;h=776566000ffed2ffed5783f2227bb36859c85005;p=git.git [PATCH] Prevent t6000 series from dropping useless sed.script in t/ The Makefile in the test suite directory considers any file matching t[0-9][0-9][0-9][0-9]-*.sh as the top-level test script to be executed. Unfortunately this was not documented, and the common test library, t6000-lib.sh was named to match that pattern. This caused t6000-lib.sh to be called from Makefile as the top-level program, causing it to leave t/sed.script file behind. Rename it to t6000lib.sh to prevent this, and document the naming convention a bit more clearly. Signed-off-by: Junio C Hamano Signed-off-by: Linus Torvalds --- diff --git a/t/README b/t/README index 2a94fdb0..ab47ef9c 100644 --- a/t/README +++ b/t/README @@ -79,6 +79,14 @@ Second digit tells the particular command we are testing. Third digit (optionally) tells the particular switch or group of switches we are testing. +If you create files under t/ directory (i.e. here) that is not +the top-level test script, never name the file to match the above +pattern. The Makefile here considers all such files as the +top-level test script and tries to run all of them. A care is +especially needed if you are creating a common test library +file, similar to test-lib.sh, because such a library file may +not be suitable for standalone execution. + Writing Tests ------------- diff --git a/t/t6000-lib.sh b/t/t6000-lib.sh deleted file mode 100644 index 01f796e9..00000000 --- a/t/t6000-lib.sh +++ /dev/null @@ -1,109 +0,0 @@ -[ -d .git/refs/tags ] || mkdir -p .git/refs/tags - -:> sed.script - -# Answer the sha1 has associated with the tag. The tag must exist in .git or .git/refs/tags -tag() -{ - _tag=$1 - [ -f .git/refs/tags/$_tag ] || error "tag: \"$_tag\" does not exist" - cat .git/refs/tags/$_tag -} - -# Generate a commit using the text specified to make it unique and the tree -# named by the tag specified. -unique_commit() -{ - _text=$1 - _tree=$2 - shift 2 - echo $_text | git-commit-tree $(tag $_tree) "$@" -} - -# Save the output of a command into the tag specified. Prepend -# a substitution script for the tag onto the front of sed.script -save_tag() -{ - _tag=$1 - [ -n "$_tag" ] || error "usage: save_tag tag commit-args ..." - shift 1 - "$@" >.git/refs/tags/$_tag - - echo "s/$(tag $_tag)/$_tag/g" > sed.script.tmp - cat sed.script >> sed.script.tmp - rm sed.script - mv sed.script.tmp sed.script -} - -# Replace unhelpful sha1 hashses with their symbolic equivalents -entag() -{ - sed -f sed.script -} - -# Execute a command after first saving, then setting the GIT_AUTHOR_EMAIL -# tag to a specified value. Restore the original value on return. -as_author() -{ - _author=$1 - shift 1 - _save=$GIT_AUTHOR_EMAIL - - export GIT_AUTHOR_EMAIL="$_author" - "$@" - export GIT_AUTHOR_EMAIL="$_save" -} - -commit_date() -{ - _commit=$1 - git-cat-file commit $_commit | sed -n "s/^committer .*> \([0-9]*\) .*/\1/p" -} - -on_committer_date() -{ - _date=$1 - shift 1 - GIT_COMMITTER_DATE=$_date "$@" -} - -# Execute a command and suppress any error output. -hide_error() -{ - "$@" 2>/dev/null -} - -check_output() -{ - _name=$1 - shift 1 - if eval "$*" | entag > $_name.actual - then - diff $_name.expected $_name.actual - else - return 1; - fi -} - -# Turn a reasonable test description into a reasonable test name. -# All alphanums translated into -'s which are then compressed and stripped -# from front and back. -name_from_description() -{ - tr "'" '-' | tr '~`!@#$%^&*()_+={}[]|\;:"<>,/? ' '-' | tr -s '-' | tr '[A-Z]' '[a-z]' | sed "s/^-*//;s/-*\$//" -} - - -# Execute the test described by the first argument, by eval'ing -# command line specified in the 2nd argument. Check the status code -# is zero and that the output matches the stream read from -# stdin. -test_output_expect_success() -{ - _description=$1 - _test=$2 - [ $# -eq 2 ] || error "usage: test_output_expect_success description test < $_name.expected - test_expect_success "$_description" "check_output $_name \"$_test\"" -} diff --git a/t/t6000lib.sh b/t/t6000lib.sh new file mode 100644 index 00000000..01f796e9 --- /dev/null +++ b/t/t6000lib.sh @@ -0,0 +1,109 @@ +[ -d .git/refs/tags ] || mkdir -p .git/refs/tags + +:> sed.script + +# Answer the sha1 has associated with the tag. The tag must exist in .git or .git/refs/tags +tag() +{ + _tag=$1 + [ -f .git/refs/tags/$_tag ] || error "tag: \"$_tag\" does not exist" + cat .git/refs/tags/$_tag +} + +# Generate a commit using the text specified to make it unique and the tree +# named by the tag specified. +unique_commit() +{ + _text=$1 + _tree=$2 + shift 2 + echo $_text | git-commit-tree $(tag $_tree) "$@" +} + +# Save the output of a command into the tag specified. Prepend +# a substitution script for the tag onto the front of sed.script +save_tag() +{ + _tag=$1 + [ -n "$_tag" ] || error "usage: save_tag tag commit-args ..." + shift 1 + "$@" >.git/refs/tags/$_tag + + echo "s/$(tag $_tag)/$_tag/g" > sed.script.tmp + cat sed.script >> sed.script.tmp + rm sed.script + mv sed.script.tmp sed.script +} + +# Replace unhelpful sha1 hashses with their symbolic equivalents +entag() +{ + sed -f sed.script +} + +# Execute a command after first saving, then setting the GIT_AUTHOR_EMAIL +# tag to a specified value. Restore the original value on return. +as_author() +{ + _author=$1 + shift 1 + _save=$GIT_AUTHOR_EMAIL + + export GIT_AUTHOR_EMAIL="$_author" + "$@" + export GIT_AUTHOR_EMAIL="$_save" +} + +commit_date() +{ + _commit=$1 + git-cat-file commit $_commit | sed -n "s/^committer .*> \([0-9]*\) .*/\1/p" +} + +on_committer_date() +{ + _date=$1 + shift 1 + GIT_COMMITTER_DATE=$_date "$@" +} + +# Execute a command and suppress any error output. +hide_error() +{ + "$@" 2>/dev/null +} + +check_output() +{ + _name=$1 + shift 1 + if eval "$*" | entag > $_name.actual + then + diff $_name.expected $_name.actual + else + return 1; + fi +} + +# Turn a reasonable test description into a reasonable test name. +# All alphanums translated into -'s which are then compressed and stripped +# from front and back. +name_from_description() +{ + tr "'" '-' | tr '~`!@#$%^&*()_+={}[]|\;:"<>,/? ' '-' | tr -s '-' | tr '[A-Z]' '[a-z]' | sed "s/^-*//;s/-*\$//" +} + + +# Execute the test described by the first argument, by eval'ing +# command line specified in the 2nd argument. Check the status code +# is zero and that the output matches the stream read from +# stdin. +test_output_expect_success() +{ + _description=$1 + _test=$2 + [ $# -eq 2 ] || error "usage: test_output_expect_success description test < $_name.expected + test_expect_success "$_description" "check_output $_name \"$_test\"" +} diff --git a/t/t6001-rev-list-merge-order.sh b/t/t6001-rev-list-merge-order.sh index 66bd9ca8..5dcb957a 100755 --- a/t/t6001-rev-list-merge-order.sh +++ b/t/t6001-rev-list-merge-order.sh @@ -6,7 +6,7 @@ test_description='Tests git-rev-list --merge-order functionality' . ./test-lib.sh -. ../t6000-lib.sh # t6xxx specific functions +. ../t6000lib.sh # t6xxx specific functions # test-case specific test function check_adjacency() diff --git a/t/t6002-rev-list-bisect.sh b/t/t6002-rev-list-bisect.sh index a5e313b2..6a718208 100755 --- a/t/t6002-rev-list-bisect.sh +++ b/t/t6002-rev-list-bisect.sh @@ -5,7 +5,7 @@ test_description='Tests git-rev-list --bisect functionality' . ./test-lib.sh -. ../t6000-lib.sh +. ../t6000lib.sh # t6xxx specific functions bc_expr() { diff --git a/t/t6003-rev-list-topo-order.sh b/t/t6003-rev-list-topo-order.sh index 98c5e2fa..eb41f86a 100755 --- a/t/t6003-rev-list-topo-order.sh +++ b/t/t6003-rev-list-topo-order.sh @@ -6,7 +6,7 @@ test_description='Tests git-rev-list --topo-order functionality' . ./test-lib.sh -. ../t6000-lib.sh # t6xxx specific functions +. ../t6000lib.sh # t6xxx specific functions list_duplicates() {