- Add tests for hash and return and more tests for set -e.

- Simplify regress.sh, sort tests.

tools/regression/bin/sh/builtins/hash1.0

@@ -0,0 +1,5 @@
+# $FreeBSD$
+cat /dev/null
+hash
+hash -r
+hash

tools/regression/bin/sh/builtins/hash1.0.stdout

@@ -0,0 +1 @@
+/bin/cat

tools/regression/bin/sh/builtins/hash2.0

@@ -0,0 +1,4 @@
+# $FreeBSD$
+hash
+hash cat
+hash

tools/regression/bin/sh/builtins/hash2.0.stdout

@@ -0,0 +1 @@
+/bin/cat

tools/regression/bin/sh/builtins/hash3.0

@@ -0,0 +1,3 @@
+# $FreeBSD$
+hash -v cat
+hash

tools/regression/bin/sh/builtins/hash3.0.stdout

@@ -0,0 +1,2 @@
+/bin/cat
+/bin/cat

tools/regression/bin/sh/builtins/return1.0

@@ -0,0 +1,7 @@
+# $FreeBSD$
+f() {
+	return 0
+	exit 1
+}
+
+f

tools/regression/bin/sh/builtins/return2.1

@@ -0,0 +1,7 @@
+# $FreeBSD$
+f() {
+	true && return 1
+	return 0
+}
+
+f

tools/regression/bin/sh/builtins/return3.1

@@ -0,0 +1,3 @@
+# $FreeBSD$
+return 1
+exit 0

tools/regression/bin/sh/regress.sh

@@ -1,6 +1,6 @@
 # $FreeBSD$
 
-echo '1..31'
+echo '1..42'
 
 COUNTER=1
 
@@ -31,12 +31,7 @@ do_test() {
 	rm tmp.stdout tmp.stderr
 }
 
-SUCCESS=$(find . -name "*.0")
-for i in ${SUCCESS} ; do
-	do_test ${i} 0
-done
-	
-FAILURE=$(find . -name "*.1")
-for i in ${FAILURE} ; do
-	do_test ${i} 1
+TESTS=$(find -s . -name "*.[01]")
+for i in ${TESTS} ; do
+	do_test ${i} ${i##*.}
 done

tools/regression/bin/sh/set-e/for1.0

@@ -0,0 +1,9 @@
+# $FreeBSD$
+set -e
+f() {
+	for i in a b c; do
+		false
+		true
+	done
+}
+f || true

tools/regression/bin/sh/set-e/func1.0

@@ -0,0 +1,7 @@
+# $FreeBSD$
+set -e
+f() {
+	false
+	true
+}
+f || true

tools/regression/bin/sh/set-e/func2.1

@@ -0,0 +1,7 @@
+# $FreeBSD$
+set -e
+f() {
+	false
+	exit 0
+}
+f

tools/regression/bin/sh/set-e/until3.0

@@ -0,0 +1,9 @@
+# $FreeBSD$
+set -e
+f() {
+	until false; do
+		false
+		break
+	done
+}
+f || true

tools/regression/bin/sh/set-e/while3.0

@@ -0,0 +1,9 @@
+# $FreeBSD$
+set -e
+f() {
+	while true; do
+		false
+		break
+	done
+}
+f || true