From 8d9d86ceab4582599d4d059296dac7244e3df475 Mon Sep 17 00:00:00 2001 From: tg Date: Fri, 14 Nov 2014 20:21:29 +0000 Subject: [PATCH] =?UTF-8?q?mark=20two=20($@/$*=20expansion-related)=20test?= =?UTF-8?q?cases=20as=20expected-fail,=20with=20more=20to=20come=20?= =?UTF-8?q?=E2=98=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- check.t | 21 ++++++++++++++++----- sh.h | 4 ++-- 2 files changed, 18 insertions(+), 7 deletions(-) diff --git a/check.t b/check.t index f965689..d994c36 100644 --- a/check.t +++ b/check.t @@ -1,4 +1,4 @@ -# $MirOS: src/bin/mksh/check.t,v 1.668 2014/10/24 12:13:52 tg Exp $ +# $MirOS: src/bin/mksh/check.t,v 1.669 2014/11/14 20:21:27 tg Exp $ # OpenBSD src/regress/bin/ksh updated: 2013/12/02 20:39:44 #- # Copyright © 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, @@ -27,7 +27,7 @@ # http://svnweb.freebsd.org/base/head/bin/test/tests/legacy_test.sh?view=co&content-type=text%2Fplain expected-stdout: - @(#)MIRBSD KSH R50 2014/10/19 + @(#)MIRBSD KSH R50 2014/11/14 description: Check version of shell. stdin: @@ -36,7 +36,7 @@ name: KSH_VERSION category: shell:legacy-no --- expected-stdout: - @(#)LEGACY KSH R50 2014/10/19 + @(#)LEGACY KSH R50 2014/11/14 description: Check version of legacy shell. stdin: @@ -4070,6 +4070,7 @@ description: 'emulate sh' zsh has extra fields in - a5ins (IFS_NWS unquoted $*) - b5ins, matching mksh’s + !!WARNING!! more to come: http://austingroupbugs.net/view.php?id=888 stdin: "$__progname" -c 'IFS=; set -- "" 2 ""; printf "[%s]\n" $*; x=$*; printf "<%s>\n" "$x"' echo '=a1zns' @@ -4201,6 +4202,15 @@ stdin: expected-stdout: <*c> . --- +name: IFS-subst-8 +description: + http://austingroupbugs.net/view.php?id=221 +stdin: + n() { echo "$#"; }; n "${foo-$@}" +expected-fail: yes +expected-stdout: + 1 +--- name: IFS-arith-1 description: http://austingroupbugs.net/view.php?id=832 @@ -8324,10 +8334,11 @@ description: Ensure concatenating behaviour matches other shells stdin: showargs() { for i; do echo -n " <$i>"; done; echo; } - x=; showargs 1 "$x$@" + x=; showargs 1 "$x"$@ set A; showargs 2 "${@:+}" +expected-fail: yes expected-stdout: - <1> + <1> <> <2> <> --- name: print-funny-chars diff --git a/sh.h b/sh.h index 9f9910f..dbfc4a8 100644 --- a/sh.h +++ b/sh.h @@ -169,9 +169,9 @@ #endif #ifdef EXTERN -__RCSID("$MirOS: src/bin/mksh/sh.h,v 1.701 2014/10/19 21:53:08 tg Exp $"); +__RCSID("$MirOS: src/bin/mksh/sh.h,v 1.702 2014/11/14 20:21:29 tg Exp $"); #endif -#define MKSH_VERSION "R50 2014/10/19" +#define MKSH_VERSION "R50 2014/11/14" /* arithmetic types: C implementation */ #if !HAVE_CAN_INTTYPES