diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2012-02-10 14:07:42 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2012-02-10 14:07:42 -0800 |
| commit | e06ed3ed8a72cadb2c3f9695825c827c1584549d (patch) | |
| tree | cb82e8b23ba19fa54d83bc8667ddce142a0fdd48 /t | |
| parent | Sync with maint (diff) | |
| parent | t0300: use write_script helper (diff) | |
| download | tgif-e06ed3ed8a72cadb2c3f9695825c827c1584549d.tar.xz | |
Merge branch 'jk/tests-write-script'
* jk/tests-write-script:
t0300: use write_script helper
tests: add write_script helper function
Diffstat (limited to 't')
| -rwxr-xr-x | t/t0300-credentials.sh | 8 | ||||
| -rw-r--r-- | t/test-lib.sh | 9 |
2 files changed, 11 insertions, 6 deletions
diff --git a/t/t0300-credentials.sh b/t/t0300-credentials.sh index 885af8fb62..8621ab036f 100755 --- a/t/t0300-credentials.sh +++ b/t/t0300-credentials.sh @@ -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" ' diff --git a/t/test-lib.sh b/t/test-lib.sh index b22bee7c84..e28d5fdebe 100644 --- a/t/test-lib.sh +++ b/t/test-lib.sh @@ -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: # |