summaryrefslogtreecommitdiffstats
path: root/tools
diff options
context:
space:
mode:
authorjilles <jilles@FreeBSD.org>2009-11-29 22:58:10 +0000
committerjilles <jilles@FreeBSD.org>2009-11-29 22:58:10 +0000
commit11d90a01c3528a755831c5e527bd9aa2098b2e20 (patch)
tree5cb6485546a25ddc975768990a32cdebc17e7cd1 /tools
parent171b4944c1b7aaf979f3823e9bdfcdae155cb5ba (diff)
downloadFreeBSD-src-11d90a01c3528a755831c5e527bd9aa2098b2e20.zip
FreeBSD-src-11d90a01c3528a755831c5e527bd9aa2098b2e20.tar.gz
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.
Diffstat (limited to 'tools')
-rw-r--r--tools/regression/bin/sh/builtins/fc1.02
-rw-r--r--tools/regression/bin/sh/errors/backquote-error1.02
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 54536ca..7cf0d94 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 4d539c0..2a40c88 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
OpenPOWER on IntegriCloud