From 5d73013c02093637ecb46ce97b139b86ff4d3db5 Mon Sep 17 00:00:00 2001 From: tg Date: Sat, 21 Jun 2008 19:20:15 +0000 Subject: [PATCH] =?UTF-8?q?remove=20check=5Fcategory=20=E2=80=9Cpdksh?= =?UTF-8?q?=E2=80=9D,=20it=20starts=20to=20make=20trouble=20and=20was=20ne?= =?UTF-8?q?ver=20taken=20seriously=20anyway,=20just=20historic=20ballast?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Build.sh | 6 +++--- Makefile | 4 ++-- check.t | 20 ++++++-------------- 3 files changed, 11 insertions(+), 19 deletions(-) diff --git a/Build.sh b/Build.sh index ef70013..6e74461 100644 --- a/Build.sh +++ b/Build.sh @@ -1,5 +1,5 @@ #!/bin/sh -srcversion='$MirOS: src/bin/mksh/Build.sh,v 1.325 2008/05/20 18:47:06 tg Exp $' +srcversion='$MirOS: src/bin/mksh/Build.sh,v 1.326 2008/06/21 19:20:14 tg Exp $' #- # Environment used: CC CFLAGS CPPFLAGS LDFLAGS LIBS NOWARN NROFF TARGET_OS # CPPFLAGS recognised: MKSH_SMALL MKSH_ASSUME_UTF8 MKSH_NOPWNAM MKSH_NOVI @@ -215,7 +215,7 @@ fi rm -f a.exe a.out *core crypt.exp lft mksh mksh.cat1 mksh.exe no *.o \ scn.c signames.inc stdint.h test.sh x -curdir=`pwd` srcdir=`dirname "$0"` check_categories=pdksh +curdir=`pwd` srcdir=`dirname "$0"` check_categories= e=echo h=1 @@ -1252,7 +1252,7 @@ cat >>test.sh <<-EOF \$perl -e print >/dev/null 2>&1 || perl=perl \$perl -e print >/dev/null 2>&1 || exit 1 exec \$perl '$srcdir/check.pl' -s '$srcdir/check.t' \\ - -p '$curdir/mksh' -C \$check_categories \$*$tsts + -p '$curdir/mksh' -C \${check_categories#,} \$*$tsts EOF chmod 755 test.sh echo set -x >Rebuild.sh diff --git a/Makefile b/Makefile index a5f673b..42674e1 100644 --- a/Makefile +++ b/Makefile @@ -1,4 +1,4 @@ -# $MirOS: src/bin/mksh/Makefile,v 1.59 2008/05/17 18:27:54 tg Exp $ +# $MirOS: src/bin/mksh/Makefile,v 1.60 2008/06/21 19:20:15 tg Exp $ #- # use CPPFLAGS=-DDEBUG __CRAZY=Yes to check for certain more stuff @@ -36,7 +36,7 @@ regress: ${PROG} check.pl check.t mkdir -p regress-dir echo export FNORD=666 >regress-dir/.mkshrc HOME=$$(readlink -nf regress-dir) perl ${.CURDIR}/check.pl \ - -s ${.CURDIR}/check.t -v -p ./${PROG} -C pdksh + -s ${.CURDIR}/check.t -v -p ./${PROG} test-build: .PHONY -rm -rf build-dir diff --git a/check.t b/check.t index 1877b39..dc31209 100644 --- a/check.t +++ b/check.t @@ -1,4 +1,4 @@ -# $MirOS: src/bin/mksh/check.t,v 1.198 2008/06/08 17:15:29 tg Exp $ +# $MirOS: src/bin/mksh/check.t,v 1.199 2008/06/21 19:20:15 tg Exp $ # $OpenBSD: bksl-nl.t,v 1.2 2001/01/28 23:04:56 niklas Exp $ # $OpenBSD: history.t,v 1.5 2001/01/28 23:04:56 niklas Exp $ # $OpenBSD: read.t,v 1.3 2003/03/10 03:48:16 david Exp $ @@ -10,7 +10,6 @@ expected-stdout: @(#)MIRBSD KSH R34 2008/06/08 description: Check version of shell. -category: pdksh stdin: echo $KSH_VERSION name: KSH_VERSION @@ -4252,7 +4251,7 @@ expected-stdout: name: persist-history-1 description: Check if persistent history saving works -category: pdksh,!no-histfile +category: !no-histfile arguments: !-i! env-setup: !ENV=./Env!HISTFILE=hist.file! file-setup: file 644 "Env" @@ -4297,7 +4296,7 @@ description: multibyte character of the shell input (with -c, from standard input, as file, or as eval argument), but nowhere else # breaks on Mac OSX (HFS+ non-standard Unicode canonical decomposition) -category: pdksh,!os:darwin +category: !os:darwin stdin: mkdir foo print '#!/bin/sh\necho ohne' >foo/fnord @@ -4342,7 +4341,7 @@ description: XXX if the OS can already execute them, we lose note: cygwin execve(2) doesn't return to us with ENOEXEC, we lose note: Ultrix perl5 t4 returns 65280 (exit-code 255) and no text -category: pdksh,!os:cygwin,!os:uwin-nt,!os:ultrix +category: !os:cygwin,!os:uwin-nt,!os:ultrix env-setup: !FOO=BAR! stdin: print '#!'"$__progname"'\nprint "a=$ENV{FOO}";' >t1 @@ -4365,7 +4364,6 @@ expected-stderr-pattern: name: utf8bom-3 description: Reading the UTF-8 BOM should enable the utf8-hack flag -category: pdksh stdin: "$__progname" -c ':; if [[ $(set +o) = *@(-o utf8-hack)@(| *) ]]; then print on; else print off; fi' "$__progname" -c ':; if [[ $(set +o) = *@(-o utf8-hack)@(| *) ]]; then print on; else print off; fi' @@ -4376,7 +4374,6 @@ expected-stdout: name: utf8opt-1 description: Check that the utf8-hack flag is not set at non-interactive startup -category: pdksh env-setup: !PS1=!PS2=!LC_CTYPE=en_US.utf8! stdin: if [[ $(set +o) = *@(-o utf8-hack)@(| *) ]]; then @@ -4390,7 +4387,7 @@ expected-stdout: name: utf8opt-2a description: Check that the utf8-hack flag is set at interactive startup -category: pdksh,os:solaris +category: os:solaris arguments: !-i! env-setup: !PS1=!PS2=!LC_CTYPE=en_US.UTF-8! stdin: @@ -4407,7 +4404,7 @@ expected-stderr-pattern: name: utf8opt-2b description: Check that the utf8-hack flag is set at interactive startup -category: pdksh,!os:solaris +category: !os:solaris arguments: !-i! env-setup: !PS1=!PS2=!LC_CTYPE=en_US.utf8! stdin: @@ -4424,7 +4421,6 @@ expected-stderr-pattern: name: aliases-1 description: Check if built-in shell aliases are okay -category: pdksh stdin: alias typeset -f @@ -4446,7 +4442,6 @@ expected-stdout: name: aliases-2a description: Check if “set -o posix” disables built-in aliases (except a few) -#category: pdksh category: disabled arguments: !-o!posix! stdin: @@ -4459,7 +4454,6 @@ expected-stdout: name: aliases-3a description: Check if running as sh disables built-in aliases (except a few) -#category: pdksh category: disabled arguments: !-o!posix! stdin: @@ -4473,7 +4467,6 @@ expected-stdout: name: aliases-2b description: Check if “set -o posix” does not influence built-in aliases -category: pdksh arguments: !-o!posix! stdin: alias @@ -4496,7 +4489,6 @@ expected-stdout: name: aliases-3b description: Check if running as sh does not influence built-in aliases -category: pdksh arguments: !-o!posix! stdin: cp "$__progname" sh