svn commit: r199955 - in head/tools/regression/bin/sh: builtins errors

[Jilles Tjoelker]

Author: jilles
Date: Sun Nov 29 22:58:10 2009
New Revision: 199955
URL: http://svn.freebsd.org/changeset/base/199955

Log:
  Disable job control when running 'sh -i' in the testsuite.
  
  Job control tty manipulations sometimes cause the tests to stop (SIGTTOU
  and the like) when run from the 'prove' tool.

Modified:
  head/tools/regression/bin/sh/builtins/fc1.0
  head/tools/regression/bin/sh/errors/backquote-error1.0

Modified: head/tools/regression/bin/sh/builtins/fc1.0
==============================================================================
--- head/tools/regression/bin/sh/builtins/fc1.0	Sun Nov 29 22:43:51 2009	(r199954)
+++ head/tools/regression/bin/sh/builtins/fc1.0	Sun Nov 29 22:58:10 2009	(r199955)
@@ -8,7 +8,7 @@ T=$(mktemp -d sh-test.XXXXXX)
 cd $T
 
 mkfifo input output error
-HISTFILE=/dev/null sh -i <input >output 2>error &
+HISTFILE=/dev/null sh +m -i <input >output 2>error &
 {
 	# Syntax error
 	echo ')' >&3

Modified: head/tools/regression/bin/sh/errors/backquote-error1.0
==============================================================================
--- head/tools/regression/bin/sh/errors/backquote-error1.0	Sun Nov 29 22:43:51 2009	(r199954)
+++ head/tools/regression/bin/sh/errors/backquote-error1.0	Sun Nov 29 22:58:10 2009	(r199955)
@@ -1,4 +1,4 @@
 # $FreeBSD$
 
-echo 'echo `for` echo ".BAD"CODE.' | sh -i 2>&1 | grep -q BADCODE && exit 1
+echo 'echo `for` echo ".BAD"CODE.' | sh +m -i 2>&1 | grep -q BADCODE && exit 1
 exit 0