diff options
| -rw-r--r-- | ChangeLog | 8 | ||||
| -rw-r--r-- | Src/utils.c | 2 | ||||
| -rw-r--r-- | Test/C02cond.ztst | 8 |
3 files changed, 13 insertions, 5 deletions
diff --git a/ChangeLog b/ChangeLog index 6e94577af..3a0c3df1a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -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 diff --git a/Src/utils.c b/Src/utils.c index e9f551d50..eab36de2a 100644 --- a/Src/utils.c +++ b/Src/utils.c @@ -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(); diff --git a/Test/C02cond.ztst b/Test/C02cond.ztst index ff5afeb08..5df2ed82f 100644 --- a/Test/C02cond.ztst +++ b/Test/C02cond.ztst @@ -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 |