system/zsh
system/zsh
1
0
Fork 0
mirror of https://github.com/zsh-users/zsh synced 2024-09-16 06:30:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

24600: yet another typo

Browse source 
24602: fix test when not run
This commit is contained in:
Peter Stephenson 2008-02-26 20:50:11 +00:00
parent 3934b6d621
commit e21bd541a2
3 changed files with 13 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
ChangeLog
View file

@ -1,3 +1,11 @@
2008-02-26 Peter Stephenson <p.w.stephenson@ntlworld.com>
* 24602: Test/C02cond.ztst: failing to run a test didn't
set prerequisites for later test.
* 24600: astonishingly, there was a fourth bug in few
lines of 24596.
2008-02-26 Geoff Wing <gcw@zsh.org>
* unposted: Src/utils.c: fix typos in 24596

2
Src/utils.c
View file

@ -4888,7 +4888,7 @@ getkeystring(char *s, int *len, int how, int *misc)
if (!codesetstr || !*codesetstr ||
!strcmp(codesetstr, "646"))
codesetstr = "US-ASCII";
cd = iconv_open(nl_langinfo(CODESET), "UCS-4BE");
cd = iconv_open(codesetstr, "UCS-4BE");
if (cd == (iconv_t)-1) {
zerr("cannot do charset conversion (iconv failed)");
CHARSET_FAILED();

8
Test/C02cond.ztst
View file

@ -125,6 +125,10 @@
# can't be bothered with -S
print -u $ZTST_fd 'This test takes two seconds...'
sleep 2
cat unmodified
touch newnewnew
if [[ $OSTYPE == "cygwin" ]]; then
print -u$ZTST_fd "Warning: not testing [[ -N file ]] (not supported on Cygwin)"
true
@ -132,10 +136,6 @@
print -u$ZTST_fd "Warning: not testing [[ -N file ]] (not supported with NFS)"
true
else
print -u $ZTST_fd 'This test takes two seconds...'
sleep 2
cat unmodified
touch newnewnew
[[ -N newnewnew && ! -N unmodified ]]
fi
0:-N cond