 @@ -1,14 +1,14 @@
-# $NetBSD: t_option.sh,v 1.2 2016/03/01 12:39:35 christos Exp $
+# $NetBSD: t_option.sh,v 1.3 2016/03/08 14:19:28 christos Exp $
+#
 # Copyright (c) 2016 The NetBSD Foundation, Inc.
 # All rights reserved.
+#
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions
 # are met:
 # 1. Redistributions of source code must retain the above copyright
 #    notice, this list of conditions and the following disclaimer.
 # 2. Redistributions in binary form must reproduce the above copyright
 #    notice, this list of conditions and the following disclaimer in the
 #    documentation and/or other materials provided with the distribution.
+#
 @@ -404,62 +404,65 @@ set_v_head() {
 	atf_set "descr" "Tests that 'set -v' turns on input read echoing " \
 	                "and that it behaves as defined by the standard"
+}
 set_v_body() {
 	test_option_on_off v
 	# check that -v does nothing if no later input line is read
 	atf_check -s exit:0 \
 			-o match:OKOK -o not-match:echo -o not-match:printf \
 			-e empty \
 		${TEST_SH} -ec 'printf "%s" OK; set -v; echo OK; exit 0'
 	# but that it does when there are multiple lines
 	cat <<- 'EOF' |
 		set -v
 		printf %s OK
 		echo OK
 		exit 0
 	EOF
 	atf_check -s exit:0 \
 			-o match:OKOK -o not-match:echo -o not-match:printf \
 			-e match:printf -e match:OK -e match:echo \
-		${TEST_SH} -ec '{
+			-e not-match:set ${TEST_SH}
 					echo "set -v"
 					echo "printf %s OK"
 					echo "echo OK"
 					echo "exit 0"
 				} | '"'${TEST_SH}'"' -e'
 	# and that it can be disabled again
 	cat <<- 'EOF' |
 		set -v
 		printf %s OK
 		set +v
 		echo OK
 		exit 0
 	EOF
 	atf_check -s exit:0 \
 			-o match:OKOK -o not-match:echo -o not-match:printf \
 			-e match:printf -e match:OK -e not-match:echo \
-		${TEST_SH} -ec '{
+				${TEST_SH}
 					echo "set -v"
 					echo "printf %s OK"
 					echo "set +v"
 					echo "echo OK"
 					echo "exit 0"
 				} | '"'${TEST_SH}'"' -e'
 	# and lastly, that shell keywords do get output when "read"
 	cat <<- 'EOF' |
 		set -v
 		for i in 111 222 333
 		do
 			printf %s $i
 		done
 		exit 0
 	EOF
 	atf_check -s exit:0 \
 			-o match:111222333 -o not-match:printf \
 			-o not-match:for -o not-match:do -o not-match:done \
 			-e match:printf -e match:111 -e not-match:111222 \
 			-e match:for -e match:do -e match:done \
-		${TEST_SH} -ec '{
+				${TEST_SH}
 					echo "set -v"
 					echo "for i in 111 222 333"
 					echo "do"
 					echo "printf %s \$i"
 					echo "done"
 					echo "exit 0"
 				} | '"'${TEST_SH}'"' -e'
+}
 atf_test_case set_x
 set_x_head() {
 	atf_set "descr" "Tests that 'set -x' turns on command exec logging " \
 	                "and that it behaves as defined by the standard"
+}
 set_x_body() {
 	test_option_on_off x
 	# check that cmd output appears after -x is enabled
 	atf_check -s exit:0 \
 			-o match:OKOK -o not-match:echo -o not-match:printf \
 @@ -590,26 +593,29 @@ vi_emacs_VE_toggle_body() {
 		set -V; q V E || x V E
 		set +EV; q "" "[VE]" || x "" VE
 		exit 0
+	'
+}
 atf_test_case xx_bogus
 xx_bogus_head() {
 	atf_set "descr" "Tests that attempting to set a nonsense option fails."
+}
 xx_bogus_body() {
 	# Biggest problem here is picking a "nonsense option" that is
 	# not implemented by any shell, anywhere.  Hopefully this will do.
 	# 'set' is a special builtin, so a conforming shell should exit
 	# on an arg error, and the ERR should not be printed.
 	atf_check -s not-exit:0 -o empty -e not-empty \
 		${TEST_SH} -c 'set -% ; echo ERR'
+}
 atf_test_case Option_switching
 Option_switching_head() {
 	atf_set "descr" "options can be enabled and disabled"
+}
 Option_switching_body() {
 	# Cannot test -m, setting it causes test shell to fail...
 	# (test shell gets SIGKILL!)  Wonder why ... something related to atf
 	# That is, it works if just run as "sh -c 'echo $-; set -m; echo $-'"