From owner-svn-src-head@FreeBSD.ORG  Sun Nov 29 22:58:10 2009
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id C15571065741;
	Sun, 29 Nov 2009 22:58:10 +0000 (UTC)
	(envelope-from jilles@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id AEC3E8FC14;
	Sun, 29 Nov 2009 22:58:10 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id nATMwA6I012088;
	Sun, 29 Nov 2009 22:58:10 GMT (envelope-from jilles@svn.freebsd.org)
Received: (from jilles@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id nATMwArp012085;
	Sun, 29 Nov 2009 22:58:10 GMT (envelope-from jilles@svn.freebsd.org)
Message-Id: <200911292258.nATMwArp012085@svn.freebsd.org>
From: Jilles Tjoelker <jilles@FreeBSD.org>
Date: Sun, 29 Nov 2009 22:58:10 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r199955 - in head/tools/regression/bin/sh: builtins
	errors
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
	<svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 29 Nov 2009 22:58:10 -0000

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