From 772e9b41dff30a252877133c9fd7112ea3660bcd Mon Sep 17 00:00:00 2001
From: Jilles Tjoelker <jilles@FreeBSD.org>
Date: Sun, 29 Nov 2009 22:58:10 +0000
Subject: [PATCH] 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.
---
 tools/regression/bin/sh/builtins/fc1.0            | 2 +-
 tools/regression/bin/sh/errors/backquote-error1.0 | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/tools/regression/bin/sh/builtins/fc1.0 b/tools/regression/bin/sh/builtins/fc1.0
index 54536ca7e8a..7cf0d943a13 100644
--- a/tools/regression/bin/sh/builtins/fc1.0
+++ b/tools/regression/bin/sh/builtins/fc1.0
@@ -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
diff --git a/tools/regression/bin/sh/errors/backquote-error1.0 b/tools/regression/bin/sh/errors/backquote-error1.0
index 4d539c03178..2a40c88e1be 100644
--- a/tools/regression/bin/sh/errors/backquote-error1.0
+++ b/tools/regression/bin/sh/errors/backquote-error1.0
@@ -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