Skip to content

Commit

Permalink
Merge branch 'jk/tests-write-script'
Browse files Browse the repository at this point in the history
* jk/tests-write-script:
  t0300: use write_script helper
  tests: add write_script helper function
  • Loading branch information
Junio C Hamano committed Feb 10, 2012
2 parents 1e9d3e3 + 3d9f5b6 commit e06ed3e
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 6 deletions.
8 changes: 2 additions & 6 deletions t/t0300-credentials.sh
Original file line number Diff line number Diff line change
Expand Up @@ -14,22 +14,18 @@ test_expect_success 'setup helper scripts' '
done
EOF
cat >git-credential-useless <<-\EOF &&
#!/bin/sh
write_script git-credential-useless <<-\EOF &&
. ./dump
exit 0
EOF
chmod +x git-credential-useless &&
cat >git-credential-verbatim <<-\EOF &&
#!/bin/sh
write_script git-credential-verbatim <<-\EOF &&
user=$1; shift
pass=$1; shift
. ./dump
test -z "$user" || echo username=$user
test -z "$pass" || echo password=$pass
EOF
chmod +x git-credential-verbatim &&
PATH="$PWD:$PATH"
'
Expand Down
9 changes: 9 additions & 0 deletions t/test-lib.sh
Original file line number Diff line number Diff line change
Expand Up @@ -395,11 +395,20 @@ test_config () {
git config "$@"
}


test_config_global () {
test_when_finished "test_unconfig --global '$1'" &&
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.
# The prerequisite can later be checked for in two ways:
#
Expand Down

0 comments on commit e06ed3e

Please sign in to comment.