From: Richard Hansen <rhansen@bbn.com>
To: git@vger.kernel.org
Cc: rhansen@bbn.com
Subject: [PATCH v2 00/11] Zsh prompt tests
Date: Wed, 4 Jun 2014 17:01:16 -0400 [thread overview]
Message-ID: <1401915687-8602-1-git-send-email-rhansen@bbn.com> (raw)
In-Reply-To: <1401176460-31564-1-git-send-email-rhansen@bbn.com>
Changes from v1:
* fix a bug that caused the Zsh test cases to run in Zsh's sh
emulation mode, not Zsh "native" mode
Description:
This series adds test cases for running __git_ps1 (see
contrib/completion/git-prompt.sh) from Zsh.
This series also adds more Bash test cases to test how __git_ps1
reacts to disabling Bash's PS1 parameter expansion. (This is related
to adding Zsh test cases: Zsh doesn't perform parameter expansion on
PS1 by default but many users turn it on, so the Zsh test script must
test __git_ps1 in both states. Bash expands PS1 by default and users
rarely turn it off, but testing both states in Bash improves the
symmetry with the Zsh test cases.)
This is the approach I took:
1. delete the last test case in t9903 ("prompt - zsh color pc mode")
2. add two new functions to t/lib-bash.sh:
ps1_expansion_enable () { shopt -s promptvars; }
ps1_expansion_disable () { shopt -u promptvars; }
3. loop over the relevant test cases twice: once after calling
ps1_expansion_enable and once after calling ps1_expansion_disable
(with appropriate adjustments to the expected output)
4. move the test cases in t9903 to a separate library file and
source it from t9903-bash-prompt.sh
5. create two new files:
* t/lib-zsh.sh (same as t/lib-bash.sh but tweaked for zsh)
* t/t9904-zsh-prompt.sh (same as t/t9903-bash-prompt.sh but
tweaked for zsh)
There are a lot of indendation changes, so I recommend examining the
changes via diff -w.
Richard Hansen (11):
t9903: remove Zsh test from the suite of Bash prompt tests
t9903: put the Bash pc mode prompt test cases in a function
t9903: move test name prefix to a separate variable
t9903: run pc mode tests again with PS1 expansion disabled
t9903: include "Bash" in test names via new $shellname var
t9903: move PS1 color code variable definitions to lib-bash.sh
t9903: move prompt tests to a new lib-prompt-tests.sh file
lib-prompt-tests.sh: put all tests inside a function
lib-prompt-tests.sh: add variable for string that encodes percent in
PS1
test-lib: make it possible to override how test code is eval'd
t9904: new __git_ps1 tests for Zsh
t/lib-bash.sh | 12 +
t/lib-prompt-tests.sh | 654 +++++++++++++++++++++++++++++++++++++++++++++++++
t/lib-zsh.sh | 52 ++++
t/t9903-bash-prompt.sh | 582 +------------------------------------------
t/t9904-zsh-prompt.sh | 10 +
t/test-lib.sh | 7 +-
6 files changed, 736 insertions(+), 581 deletions(-)
create mode 100644 t/lib-prompt-tests.sh
create mode 100644 t/lib-zsh.sh
create mode 100755 t/t9904-zsh-prompt.sh
--
2.0.0
next prev parent reply other threads:[~2014-06-04 21:01 UTC|newest]
Thread overview: 35+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-05-19 22:55 [PATCH] git-prompt.sh: don't assume the shell expands the value of PS1 Richard Hansen
2014-05-20 18:38 ` Junio C Hamano
2014-05-27 7:40 ` [PATCH 00/10] Zsh prompt tests Richard Hansen
2014-05-27 7:40 ` [PATCH 01/10] t9903: remove Zsh test from the suite of Bash " Richard Hansen
2014-05-27 7:40 ` [PATCH 02/10] t9903: put the Bash pc mode prompt test cases in a function Richard Hansen
2014-05-27 7:40 ` [PATCH 03/10] t9903: move test name prefix to a separate variable Richard Hansen
2014-05-27 7:40 ` [PATCH 04/10] t9903: run pc mode tests again with PS1 expansion disabled Richard Hansen
2014-05-27 7:40 ` [PATCH 05/10] t9903: include "Bash" in test names via new $shellname var Richard Hansen
2014-05-27 7:40 ` [PATCH 06/10] t9903: move PS1 color code variable definitions to lib-bash.sh Richard Hansen
2014-05-27 7:40 ` [PATCH 07/10] t9903: move prompt tests to a new lib-prompt-tests.sh file Richard Hansen
2014-05-27 7:40 ` [PATCH 08/10] lib-prompt-tests.sh: put all tests inside a function Richard Hansen
2014-05-27 7:40 ` [PATCH 09/10] lib-prompt-tests.sh: add variable for string that encodes percent in PS1 Richard Hansen
2014-05-27 7:41 ` [PATCH 10/10] t9904: new __git_ps1 tests for Zsh Richard Hansen
2014-05-29 19:02 ` Thomas Rast
2014-05-29 22:30 ` [PATCH 11/10] fixup! " Richard Hansen
2014-06-04 21:01 ` Richard Hansen [this message]
2014-06-04 21:01 ` [PATCH v2 01/11] t9903: remove Zsh test from the suite of Bash prompt tests Richard Hansen
2014-06-04 21:01 ` [PATCH v2 02/11] t9903: put the Bash pc mode prompt test cases in a function Richard Hansen
2014-06-04 21:01 ` [PATCH v2 03/11] t9903: move test name prefix to a separate variable Richard Hansen
2014-06-04 21:01 ` [PATCH v2 04/11] t9903: run pc mode tests again with PS1 expansion disabled Richard Hansen
2014-06-04 21:01 ` [PATCH v2 05/11] t9903: include "Bash" in test names via new $shellname var Richard Hansen
2014-06-04 21:01 ` [PATCH v2 06/11] t9903: move PS1 color code variable definitions to lib-bash.sh Richard Hansen
2014-06-04 21:01 ` [PATCH v2 07/11] t9903: move prompt tests to a new lib-prompt-tests.sh file Richard Hansen
2014-06-04 21:01 ` [PATCH v2 08/11] lib-prompt-tests.sh: put all tests inside a function Richard Hansen
2014-06-04 21:01 ` [PATCH v2 09/11] lib-prompt-tests.sh: add variable for string that encodes percent in PS1 Richard Hansen
2014-06-04 21:01 ` [PATCH v2 10/11] test-lib: make it possible to override how test code is eval'd Richard Hansen
2014-06-05 21:11 ` Junio C Hamano
2014-06-06 1:00 ` Richard Hansen
2014-06-06 16:53 ` Junio C Hamano
2014-06-04 21:01 ` [PATCH v2 11/11] t9904: new __git_ps1 tests for Zsh Richard Hansen
2014-06-10 20:06 ` [PATCH v2 00/11] Zsh prompt tests Torsten Bögershausen
2014-06-10 20:28 ` Richard Hansen
2014-06-11 1:16 ` brian m. carlson
2014-06-11 15:27 ` Richard Hansen
2014-06-11 23:46 ` brian m. carlson
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1401915687-8602-1-git-send-email-rhansen@bbn.com \
--to=rhansen@bbn.com \
--cc=git@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).