From ce11895d5cc5920e5ef01525aa8355357ee0820e Mon Sep 17 00:00:00 2001 From: Jon Seymour Date: Wed, 6 Jul 2005 20:11:24 +1000 Subject: [PATCH] [PATCH] Factor out useful test case infrastructure from t/t6001... into t/t6000-lib.sh Functions that are useful to other t6xxx testcases are moved into t6000-lib.sh To use these functions in a test case, use a test-case pre-amble like: . ./test-lib.sh . ../t6000-lib.sh # t6xxx specific functions Signed-off-by: Jon Seymour Signed-off-by: Linus Torvalds --- t/t6000-lib.sh | 105 +++++++++++++++++++++++++++++++++++++ t/t6001-rev-list-merge-order.sh | 112 +--------------------------------------- 2 files changed, 106 insertions(+), 111 deletions(-) create mode 100644 t/t6000-lib.sh diff --git a/t/t6000-lib.sh b/t/t6000-lib.sh new file mode 100644 index 0000000000..aa7a98a01b --- /dev/null +++ b/t/t6000-lib.sh @@ -0,0 +1,105 @@ +[ -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 + sed_script="s/$(tag $_tag)/$_tag/g${sed_script+;}$sed_script" +} + +# Replace unhelpful sha1 hashses with their symbolic equivalents +entag() +{ + sed "$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 04dede0915..d93988de41 100755 --- a/t/t6001-rev-list-merge-order.sh +++ b/t/t6001-rev-list-merge-order.sh @@ -6,117 +6,7 @@ test_description='Tests git-rev-list --merge-order functionality' . ./test-lib.sh - -# -# TODO: move the following block (upto --- end ...) into testlib.sh -# -[ -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 - sed_script="s/$(tag $_tag)/$_tag/g${sed_script+;}$sed_script" -} - -# Replace unhelpful sha1 hashses with their symbolic equivalents -entag() -{ - sed "$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\"" -} - -# --- end of stuff to move --- +. ../t6000-lib.sh # t6xxx specific functions # test-case specific test function check_adjacency() -- 2.11.4.GIT