if building a small mksh, don't check for persistent history,
since it's not supported anyway; makes regression tests pass there
This commit is contained in:
		
							
								
								
									
										7
									
								
								Build.sh
									
									
									
									
									
								
							
							
						
						
									
										7
									
								
								Build.sh
									
									
									
									
									
								
							| @@ -1,5 +1,5 @@ | |||||||
| #!/bin/sh | #!/bin/sh | ||||||
| # $MirOS: src/bin/mksh/Build.sh,v 1.88 2007/01/11 00:57:56 tg Exp $ | # $MirOS: src/bin/mksh/Build.sh,v 1.89 2007/01/11 02:08:49 tg Exp $ | ||||||
| #- | #- | ||||||
| # Environment: CC, CFLAGS, CPPFLAGS, LDFLAGS, LIBS, NROFF | # Environment: CC, CFLAGS, CPPFLAGS, LDFLAGS, LIBS, NROFF | ||||||
| # With -x: SRCS (extra), sigseen (XXX go away), TARGET_OS | # With -x: SRCS (extra), sigseen (XXX go away), TARGET_OS | ||||||
| @@ -84,7 +84,7 @@ fi | |||||||
|  |  | ||||||
| : ${CFLAGS='-O2 -fno-strict-aliasing -Wall'} | : ${CFLAGS='-O2 -fno-strict-aliasing -Wall'} | ||||||
| : ${CC=gcc} ${NROFF=nroff} | : ${CC=gcc} ${NROFF=nroff} | ||||||
| curdir=`pwd` srcdir=`dirname "$0"` | curdir=`pwd` srcdir=`dirname "$0"` check_categories=pdksh | ||||||
| echo | $NROFF -v 2>&1 | grep GNU >&- 2>&- && NROFF="$NROFF -c" | echo | $NROFF -v 2>&1 | grep GNU >&- 2>&- && NROFF="$NROFF -c" | ||||||
|  |  | ||||||
| e=echo | e=echo | ||||||
| @@ -210,6 +210,7 @@ if test 0 = $HAVE_MKSH_FULL; then | |||||||
| 	test 1 = $HAVE_CAN_FNOINLINE || CFLAGS=$save_CFLAGS | 	test 1 = $HAVE_CAN_FNOINLINE || CFLAGS=$save_CFLAGS | ||||||
|  |  | ||||||
| 	HAVE_LANGINFO_CODESET=0 | 	HAVE_LANGINFO_CODESET=0 | ||||||
|  | 	check_categories=$check_categories,smksh | ||||||
| fi | fi | ||||||
|  |  | ||||||
| save_CFLAGS=$CFLAGS | save_CFLAGS=$CFLAGS | ||||||
| @@ -300,7 +301,7 @@ case $curdir in | |||||||
| *)	echo "#!$curdir/mksh" >test.sh ;; | *)	echo "#!$curdir/mksh" >test.sh ;; | ||||||
| esac | esac | ||||||
| echo "exec perl '$srcdir/check.pl' -s '$srcdir/check.t'" \ | echo "exec perl '$srcdir/check.pl' -s '$srcdir/check.t'" \ | ||||||
|     "-p '$curdir/mksh' -C pdksh \$*" >>test.sh |     "-p '$curdir/mksh' -C $check_categories \$*" >>test.sh | ||||||
| chmod 755 test.sh | chmod 755 test.sh | ||||||
| i=install | i=install | ||||||
| test -f /usr/ucb/$i && i=/usr/ucb/$i | test -f /usr/ucb/$i && i=/usr/ucb/$i | ||||||
|   | |||||||
							
								
								
									
										4
									
								
								check.t
									
									
									
									
									
								
							
							
						
						
									
										4
									
								
								check.t
									
									
									
									
									
								
							| @@ -1,4 +1,4 @@ | |||||||
| # $MirOS: src/bin/mksh/check.t,v 1.79 2007/01/11 00:32:30 tg Exp $ | # $MirOS: src/bin/mksh/check.t,v 1.80 2007/01/11 02:08:50 tg Exp $ | ||||||
| # $OpenBSD: bksl-nl.t,v 1.2 2001/01/28 23:04:56 niklas 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: 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 $ | # $OpenBSD: read.t,v 1.3 2003/03/10 03:48:16 david Exp $ | ||||||
| @@ -3862,7 +3862,7 @@ name: persist-history-1 | |||||||
| description: | description: | ||||||
| 	Check if persistent history saving works | 	Check if persistent history saving works | ||||||
| # we don't have persistent history on Solaris (no flock) | # we don't have persistent history on Solaris (no flock) | ||||||
| category: !os:solaris,!os:plan9,pdksh | category: !os:solaris,!os:plan9,pdksh,!smksh | ||||||
| arguments: !-i! | arguments: !-i! | ||||||
| env-setup: !ENV=./Env!HISTFILE=hist.file! | env-setup: !ENV=./Env!HISTFILE=hist.file! | ||||||
| file-setup: file 644 "Env" | file-setup: file 644 "Env" | ||||||
|   | |||||||
		Reference in New Issue
	
	Block a user