diff options
| author | Richard Hansen <rhansen@bbn.com> | 2014-05-27 03:40:53 -0400 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2014-05-27 14:05:43 -0700 |
| commit | 226e691beca234517a2c050ef000a8ca0685150c (patch) | |
| tree | 59b54bf992015de61e5f3d952222f67093eecbab | |
| parent | 40c78600a04bb1d38b682043587d2b1e60a9029c (diff) | |
| download | git-226e691beca234517a2c050ef000a8ca0685150c.tar.gz | |
t9903: move test name prefix to a separate variable
This is a step toward reusing the same test cases after disabling PS1
parameter expansion.
Signed-off-by: Richard Hansen <rhansen@bbn.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| -rwxr-xr-x | t/t9903-bash-prompt.sh | 20 |
1 files changed, 11 insertions, 9 deletions
diff --git a/t/t9903-bash-prompt.sh b/t/t9903-bash-prompt.sh index c691869376..d29dd2b19b 100755 --- a/t/t9903-bash-prompt.sh +++ b/t/t9903-bash-prompt.sh @@ -463,7 +463,9 @@ run_pcmode_tests () { test_cmp expected "$actual" ' - test_expect_success 'prompt - bash color pc mode - branch name' ' + pfx="prompt - bash color pc mode" + + test_expect_success "$pfx - branch name" ' printf "BEFORE: (${c_green}\${__git_ps1_branch_name}${c_clear}):AFTER\\nmaster" >expected && ( GIT_PS1_SHOWCOLORHINTS=y && @@ -473,7 +475,7 @@ run_pcmode_tests () { test_cmp expected "$actual" ' - test_expect_success 'prompt - bash color pc mode - detached head' ' + test_expect_success "$pfx - detached head" ' printf "BEFORE: (${c_red}\${__git_ps1_branch_name}${c_clear}):AFTER\\n(%s...)" $(git log -1 --format="%h" b1^) >expected && git checkout b1^ && test_when_finished "git checkout master" && @@ -485,7 +487,7 @@ run_pcmode_tests () { test_cmp expected "$actual" ' - test_expect_success 'prompt - bash color pc mode - dirty status indicator - dirty worktree' ' + test_expect_success "$pfx - dirty status indicator - dirty worktree" ' printf "BEFORE: (${c_green}\${__git_ps1_branch_name}${c_clear} ${c_red}*${c_clear}):AFTER\\nmaster" >expected && echo "dirty" >file && test_when_finished "git reset --hard" && @@ -498,7 +500,7 @@ run_pcmode_tests () { test_cmp expected "$actual" ' - test_expect_success 'prompt - bash color pc mode - dirty status indicator - dirty index' ' + test_expect_success "$pfx - dirty status indicator - dirty index" ' printf "BEFORE: (${c_green}\${__git_ps1_branch_name}${c_clear} ${c_green}+${c_clear}):AFTER\\nmaster" >expected && echo "dirty" >file && test_when_finished "git reset --hard" && @@ -512,7 +514,7 @@ run_pcmode_tests () { test_cmp expected "$actual" ' - test_expect_success 'prompt - bash color pc mode - dirty status indicator - dirty index and worktree' ' + test_expect_success "$pfx - dirty status indicator - dirty index and worktree" ' printf "BEFORE: (${c_green}\${__git_ps1_branch_name}${c_clear} ${c_red}*${c_green}+${c_clear}):AFTER\\nmaster" >expected && echo "dirty index" >file && test_when_finished "git reset --hard" && @@ -527,7 +529,7 @@ run_pcmode_tests () { test_cmp expected "$actual" ' - test_expect_success 'prompt - bash color pc mode - dirty status indicator - before root commit' ' + test_expect_success "$pfx - dirty status indicator - before root commit" ' printf "BEFORE: (${c_green}\${__git_ps1_branch_name}${c_clear} ${c_green}#${c_clear}):AFTER\\nmaster" >expected && ( GIT_PS1_SHOWDIRTYSTATE=y && @@ -539,7 +541,7 @@ run_pcmode_tests () { test_cmp expected "$actual" ' - test_expect_success 'prompt - bash color pc mode - inside .git directory' ' + test_expect_success "$pfx - inside .git directory" ' printf "BEFORE: (${c_green}\${__git_ps1_branch_name}${c_clear}):AFTER\\nGIT_DIR!" >expected && echo "dirty" >file && test_when_finished "git reset --hard" && @@ -553,7 +555,7 @@ run_pcmode_tests () { test_cmp expected "$actual" ' - test_expect_success 'prompt - bash color pc mode - stash status indicator' ' + test_expect_success "$pfx - stash status indicator" ' printf "BEFORE: (${c_green}\${__git_ps1_branch_name}${c_clear} ${c_lblue}\$${c_clear}):AFTER\\nmaster" >expected && echo 2 >file && git stash && @@ -567,7 +569,7 @@ run_pcmode_tests () { test_cmp expected "$actual" ' - test_expect_success 'prompt - bash color pc mode - untracked files status indicator' ' + test_expect_success "$pfx - untracked files status indicator" ' printf "BEFORE: (${c_green}\${__git_ps1_branch_name}${c_clear} ${c_red}%%${c_clear}):AFTER\\nmaster" >expected && ( GIT_PS1_SHOWUNTRACKEDFILES=y && |