Module Name: src
Committed By: christos
Date: Sun Mar 27 14:50:01 UTC 2016
Modified Files:
src/tests/bin/sh: t_evaltested.sh t_fsplit.sh t_set_e.sh t_ulimit.sh
t_varquote.sh
Log Message:
Finish TEST_SH - all tests should support it now.
Misc other KNF changes, minor bug fixes, and a few minor
extra tests added. (from kre@)
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/tests/bin/sh/t_evaltested.sh
cvs rdiff -u -r1.3 -r1.4 src/tests/bin/sh/t_fsplit.sh
cvs rdiff -u -r1.2 -r1.3 src/tests/bin/sh/t_set_e.sh \
src/tests/bin/sh/t_ulimit.sh
cvs rdiff -u -r1.4 -r1.5 src/tests/bin/sh/t_varquote.sh
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/tests/bin/sh/t_evaltested.sh
diff -u src/tests/bin/sh/t_evaltested.sh:1.1 src/tests/bin/sh/t_evaltested.sh:1.2
--- src/tests/bin/sh/t_evaltested.sh:1.1 Sat Mar 17 12:33:11 2012
+++ src/tests/bin/sh/t_evaltested.sh Sun Mar 27 10:50:01 2016
@@ -1,4 +1,4 @@
-# $NetBSD: t_evaltested.sh,v 1.1 2012/03/17 16:33:11 jruoho Exp $
+# $NetBSD: t_evaltested.sh,v 1.2 2016/03/27 14:50:01 christos Exp $
#
# Copyright (c) 2011 The NetBSD Foundation, Inc.
# All rights reserved.
@@ -24,6 +24,8 @@
# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
# POSSIBILITY OF SUCH DAMAGE.
#
+# the implementation of "sh" to test
+: ${TEST_SH:="/bin/sh"}
atf_test_case evaltested
@@ -43,7 +45,7 @@ fi
echo "passed"
exit 0
EOF
- output="$(/bin/sh helper.sh)"
+ output="$($TEST_SH helper.sh)"
[ $? = 0 ] && return
if [ -n "$output" ]
Index: src/tests/bin/sh/t_fsplit.sh
diff -u src/tests/bin/sh/t_fsplit.sh:1.3 src/tests/bin/sh/t_fsplit.sh:1.4
--- src/tests/bin/sh/t_fsplit.sh:1.3 Thu Mar 10 17:30:57 2016
+++ src/tests/bin/sh/t_fsplit.sh Sun Mar 27 10:50:01 2016
@@ -1,4 +1,4 @@
-# $NetBSD: t_fsplit.sh,v 1.3 2016/03/10 22:30:57 christos Exp $
+# $NetBSD: t_fsplit.sh,v 1.4 2016/03/27 14:50:01 christos Exp $
#
# Copyright (c) 2007-2016 The NetBSD Foundation, Inc.
# All rights reserved.
@@ -294,6 +294,11 @@ dollar_at_body() {
'zaz zbz zcz'
check 'set " a b " c; for i in "$@"; do echo "z${i}z"; done' \
'z a b z zcz'
+
+ check 'set a b c; for i in "$@$@"; do echo "z${i}z"; done' \
+ 'zaz zbz zcaz zbz zcz'
+ check 'set a b c; for i in "$@""$@";do echo "z${i}z"; done' \
+ 'zaz zbz zcaz zbz zcz'
}
atf_test_case ifs
Index: src/tests/bin/sh/t_set_e.sh
diff -u src/tests/bin/sh/t_set_e.sh:1.2 src/tests/bin/sh/t_set_e.sh:1.3
--- src/tests/bin/sh/t_set_e.sh:1.2 Tue Mar 8 09:20:22 2016
+++ src/tests/bin/sh/t_set_e.sh Sun Mar 27 10:50:01 2016
@@ -1,4 +1,4 @@
-# $NetBSD: t_set_e.sh,v 1.2 2016/03/08 14:20:22 christos Exp $
+# $NetBSD: t_set_e.sh,v 1.3 2016/03/27 14:50:01 christos Exp $
#
# Copyright (c) 2007 The NetBSD Foundation, Inc.
# All rights reserved.
@@ -81,8 +81,8 @@ all_body() {
# first, check basic functioning.
# The ERR shouldn't print; the result of the () should be 1.
# Henceforth we'll assume that we don't need to check $?.
- dcheck '(set -e; false; echo ERR$?); echo -n OK$?' 'OK1'
- echeck '(set -e; false; echo ERR$?); echo -n OK$?' 'OK1'
+ dcheck '(set -e; false; echo ERR$?); echo OK$?' 'OK1'
+ echeck '(set -e; false; echo ERR$?); echo OK$?' 'OK1'
# these cases should be equivalent to the preceding.
dcheck '(set -e; /nonexistent; echo ERR); echo OK' 'OK'
Index: src/tests/bin/sh/t_ulimit.sh
diff -u src/tests/bin/sh/t_ulimit.sh:1.2 src/tests/bin/sh/t_ulimit.sh:1.3
--- src/tests/bin/sh/t_ulimit.sh:1.2 Wed Dec 30 17:24:44 2015
+++ src/tests/bin/sh/t_ulimit.sh Sun Mar 27 10:50:01 2016
@@ -1,4 +1,4 @@
-# $NetBSD: t_ulimit.sh,v 1.2 2015/12/30 22:24:44 christos Exp $
+# $NetBSD: t_ulimit.sh,v 1.3 2016/03/27 14:50:01 christos Exp $
#
# Copyright (c) 2012 The NetBSD Foundation, Inc.
# All rights reserved.
@@ -24,6 +24,8 @@
# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
# POSSIBILITY OF SUCH DAMAGE.
#
+# the implementation of "sh" to test
+: ${TEST_SH:="/bin/sh"}
# ulimit builtin test.
@@ -33,7 +35,7 @@ limits_head() {
}
get_ulimits() {
- local limits=$(ulimit -a |
+ local limits=$(${TEST_SH} -c 'ulimit -a' |
sed -e 's/.*\(-[A-Za-z0-9]\)[^A-Za-z0-9].*/\1/' | sort -u)
if [ -z "$limits" ]; then
# grr ksh
@@ -43,12 +45,10 @@ get_ulimits() {
}
limits_body() {
- atf_check -s eq:0 -o ignore -e empty \
- /bin/sh -c "ulimit -a"
+ atf_check -s eq:0 -o ignore -e empty ${TEST_SH} -c "ulimit -a"
for l in $(get_ulimits)
do
- atf_check -s eq:0 -o ignore -e empty \
- /bin/sh -c "ulimit $l"
+ atf_check -s eq:0 -o ignore -e empty ${TEST_SH} -c "ulimit $l"
done
}
Index: src/tests/bin/sh/t_varquote.sh
diff -u src/tests/bin/sh/t_varquote.sh:1.4 src/tests/bin/sh/t_varquote.sh:1.5
--- src/tests/bin/sh/t_varquote.sh:1.4 Sat Mar 12 09:58:03 2016
+++ src/tests/bin/sh/t_varquote.sh Sun Mar 27 10:50:01 2016
@@ -1,4 +1,4 @@
-# $NetBSD: t_varquote.sh,v 1.4 2016/03/12 14:58:03 christos Exp $
+# $NetBSD: t_varquote.sh,v 1.5 2016/03/27 14:50:01 christos Exp $
#
# Copyright (c) 2007 The NetBSD Foundation, Inc.
# All rights reserved.
@@ -125,7 +125,6 @@ default_assignment_with_arith_head() {
default_assignment_with_arith_body() {
atf_check -s eq:0 -o empty -e empty ${TEST_SH} -c ': "${x=$((1))}"'
atf_check -s eq:0 -o match:1 -e empty ${TEST_SH} -c 'echo "${x=$((1))}"'
-
}
atf_init_test_cases() {
