use new logmsg and set --show in tests

This commit is contained in:
Kurtis Rader 2017-08-04 13:36:51 -07:00
parent 2f1e70dc1b
commit 9028104536
3 changed files with 26 additions and 5 deletions

View file

@ -0,0 +1,12 @@
####################
# Test scoping rules for functions
####################
# Verify subcommand statuses
####################
# Verify that set passes through exit status, except when passed -n or -q or -e
####################
# Verify set -ql behavior (#2502)

View file

@ -1,4 +1,4 @@
#Test scoping rules for functions logmsg Test scoping rules for functions
set -e smurf set -e smurf
@ -161,10 +161,10 @@ end;
set -U -e baz set -U -e baz
echo "# Verify subcommand statuses" logmsg Verify subcommand statuses
echo (false) $status (true) $status (false) $status echo (false) $status (true) $status (false) $status
echo "# Verify that set passes through exit status, except when passed -n or -q or -e" logmsg Verify that set passes through exit status, except when passed -n or -q or -e
false ; set foo bar ; echo 1 $status # passthrough false ; set foo bar ; echo 1 $status # passthrough
true ; set foo bar ; echo 2 $status # passthrough true ; set foo bar ; echo 2 $status # passthrough
false ; set -q foo ; echo 3 $status # no passthrough false ; set -q foo ; echo 3 $status # no passthrough
@ -178,7 +178,7 @@ false ; set foo (echo A; true) ; echo 10 $status $foo
true ; set foo (echo B; false) ; echo 11 $status $foo true ; set foo (echo B; false) ; echo 11 $status $foo
true true
echo "# Verify set -ql behavior" # see 2502 logmsg "Verify set -ql behavior (#2502)"
function setql_check function setql_check
set -l setql_foo val set -l setql_foo val
if set -ql setql_foo if set -ql setql_foo

View file

@ -1,3 +1,6 @@
####################
# Test scoping rules for functions
Test 1 pass Test 1 pass
Test 2 pass Test 2 pass
Test 3 pass Test 3 pass
@ -20,8 +23,12 @@ Test 19 pass
Test 20 pass Test 20 pass
Test 21 pass Test 21 pass
Test 22 pass Test 22 pass
####################
# Verify subcommand statuses # Verify subcommand statuses
1 0 1 1 0 1
####################
# Verify that set passes through exit status, except when passed -n or -q or -e # Verify that set passes through exit status, except when passed -n or -q or -e
1 1 1 1
2 0 2 0
@ -34,5 +41,7 @@ Test 22 pass
9 121 9 121
10 0 A 10 0 A
11 1 B 11 1 B
# Verify set -ql behavior
####################
# Verify set -ql behavior (#2502)
Pass Pass