From d17e25c7f4d57491e1742b9d8970f555feb80e80 Mon Sep 17 00:00:00 2001 From: tg Date: Fri, 29 Feb 2008 11:57:30 +0000 Subject: [PATCH] fix passing of env var to regression tests --- Build.sh | 5 ++--- Makefile | 4 ++-- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/Build.sh b/Build.sh index 5380a56..4fde5e7 100644 --- a/Build.sh +++ b/Build.sh @@ -1,5 +1,5 @@ #!/bin/sh -# $MirOS: src/bin/mksh/Build.sh,v 1.276 2008/02/29 11:48:31 tg Exp $ +# $MirOS: src/bin/mksh/Build.sh,v 1.277 2008/02/29 11:57:30 tg Exp $ #- # Environment used: CC CFLAGS CPPFLAGS LDFLAGS LIBS NOWARN NROFF TARGET_OS # CPPFLAGS recognised: MKSH_SMALL MKSH_ASSUME_UTF8 MKSH_NOPWNAM MKSH_NOVI @@ -993,9 +993,8 @@ case $curdir in *\ *) echo "#!./mksh" >test.sh ;; *) echo "#!$curdir/mksh" >test.sh ;; esac -echo "export tr=$tr" >>test.sh echo "export PATH='$PATH'" >>test.sh -echo "exec perl '$srcdir/check.pl' -s '$srcdir/check.t'" \ +echo "exec perl '$srcdir/check.pl' -s '$srcdir/check.t' -e 'tr=$tr'" \ "-p '$curdir/mksh' -C $check_categories \$*$tsts" >>test.sh chmod 755 test.sh echo set -x >Rebuild.sh diff --git a/Makefile b/Makefile index 1eebd01..e81672b 100644 --- a/Makefile +++ b/Makefile @@ -1,4 +1,4 @@ -# $MirOS: src/bin/mksh/Makefile,v 1.50 2007/10/25 14:43:02 tg Exp $ +# $MirOS: src/bin/mksh/Makefile,v 1.51 2008/02/29 11:57:30 tg Exp $ #- # use CPPFLAGS=-DDEBUG __CRAZY=Yes to check for certain more stuff @@ -35,7 +35,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 + -e tr=tr -s ${.CURDIR}/check.t -v -p ./${PROG} -C pdksh test-build: .PHONY -rm -rf build-dir