Merge branch 'jk/tests-write-script'

* jk/tests-write-script:
  t0300: use write_script helper
  tests: add write_script helper function
This commit is contained in:
Junio C Hamano 2012-02-10 14:07:42 -08:00
commit e06ed3ed8a
2 changed files with 11 additions and 6 deletions

View File

@ -14,22 +14,18 @@ test_expect_success 'setup helper scripts' '
done done
EOF EOF
cat >git-credential-useless <<-\EOF && write_script git-credential-useless <<-\EOF &&
#!/bin/sh
. ./dump . ./dump
exit 0 exit 0
EOF EOF
chmod +x git-credential-useless &&
cat >git-credential-verbatim <<-\EOF && write_script git-credential-verbatim <<-\EOF &&
#!/bin/sh
user=$1; shift user=$1; shift
pass=$1; shift pass=$1; shift
. ./dump . ./dump
test -z "$user" || echo username=$user test -z "$user" || echo username=$user
test -z "$pass" || echo password=$pass test -z "$pass" || echo password=$pass
EOF EOF
chmod +x git-credential-verbatim &&
PATH="$PWD:$PATH" PATH="$PWD:$PATH"
' '

View File

@ -395,11 +395,20 @@ test_config () {
git config "$@" git config "$@"
} }
test_config_global () { test_config_global () {
test_when_finished "test_unconfig --global '$1'" && test_when_finished "test_unconfig --global '$1'" &&
git config --global "$@" git config --global "$@"
} }
write_script () {
{
echo "#!${2-"$SHELL_PATH"}" &&
cat
} >"$1" &&
chmod +x "$1"
}
# Use test_set_prereq to tell that a particular prerequisite is available. # Use test_set_prereq to tell that a particular prerequisite is available.
# The prerequisite can later be checked for in two ways: # The prerequisite can later be checked for in two ways:
# #