diff options
| author | Peter Stephenson <pws@zsh.org> | 2016-12-09 10:18:24 +0000 |
|---|---|---|
| committer | Peter Stephenson <pws@zsh.org> | 2016-12-09 10:18:24 +0000 |
| commit | 2e307108a0545d60f5620b6243850d5f0c21858d (patch) | |
| tree | bc4ccae9383c82419bb291835ed643ad46434fc2 | |
| parent | feb4be4a5e818bbbe4e5f9de725b272665148185 (diff) | |
| download | zsh-2e307108a0545d60f5620b6243850d5f0c21858d.tar.gz zsh-2e307108a0545d60f5620b6243850d5f0c21858d.tar.xz zsh-2e307108a0545d60f5620b6243850d5f0c21858d.zip | |
40138: Move regex multibyte test.
Put it last as it has an additional dependency. Output a failure message indicating this.
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | Test/D07multibyte.ztst | 28 |
2 files changed, 22 insertions, 12 deletions
diff --git a/ChangeLog b/ChangeLog index 58d17e5d1..3d6bd4ba2 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2016-12-09 Peter Stephenson <p.stephenson@samsung.com> + + * 40138: Test/D07multibyte.ztst: Put the regex test last as it + has an additional dependency, and note this in a failure + message. + 2016-12-09 Daniel Shahaf <d.s@daniel.shahaf.name> * 40126: Functions/Misc/zed: zed (fned): When editing a new diff --git a/Test/D07multibyte.ztst b/Test/D07multibyte.ztst index 3a6e95543..cdc070e87 100644 --- a/Test/D07multibyte.ztst +++ b/Test/D07multibyte.ztst @@ -500,18 +500,6 @@ # aren't quite double width, but the arithmetic is correct. # It appears just to be an effect of the font. - if zmodload zsh/regex 2>/dev/null; then - [[ $'\ua0' =~ '^.$' ]] && print OK - [[ $'\ua0' =~ $'^\ua0$' ]] && print OK - [[ $'\ua0'X =~ '^X$' ]] || print OK - else - ZTST_skip="regexp library not found." - fi -0:Ensure no confusion on metafied input to regex module ->OK ->OK ->OK - () { emulate -L zsh setopt errreturn @@ -583,3 +571,19 @@ printf '%q%q\n' 你你 0:printf %q and quotestring and general metafy / token madness >你你 + +# This test is kept last as it introduces an additional +# dependency on the system regex library. + if zmodload zsh/regex 2>/dev/null; then + [[ $'\ua0' =~ '^.$' ]] && print OK + [[ $'\ua0' =~ $'^\ua0$' ]] && print OK + [[ $'\ua0'X =~ '^X$' ]] || print OK + else + ZTST_skip="regexp library not found." + fi +0:Ensure no confusion on metafied input to regex module +>OK +>OK +>OK +F:A failure here may indicate the system regex library does not +F:support character sets outside the portable 7-bit range. |