diff options
Diffstat (limited to 'Test/ztst.zsh')
| -rwxr-xr-x | Test/ztst.zsh | 104 |
1 files changed, 82 insertions, 22 deletions
diff --git a/Test/ztst.zsh b/Test/ztst.zsh index fe996832c..0b748dac9 100755 --- a/Test/ztst.zsh +++ b/Test/ztst.zsh @@ -22,6 +22,12 @@ # still not be good enough. Maybe we should trick it somehow. emulate -R zsh +# Ensure the locale does not screw up sorting. Don't supply a locale +# unless there's one set, to minimise problems. +[[ -n $LC_ALL ]] && LC_ALL=C +[[ -n $LC_COLLATE ]] && LC_COLLATE=C +[[ -n $LANG ]] && LANG=C + # Set the module load path to correspond to this build of zsh. # This Modules directory should have been created by "make check". [[ -d Modules/zsh ]] && module_path=( $PWD/Modules ) @@ -47,12 +53,21 @@ ZTST_mainopts=(${(kv)options}) ZTST_testdir=$PWD ZTST_testname=$1 -# The source directory is not necessarily the current directory -ZTST_srcdir=${0%/*} +integer ZTST_testfailed + +# The source directory is not necessarily the current directory, +# but if $0 doesn't contain a `/' assume it is. +if [[ $0 = */* ]]; then + ZTST_srcdir=${0%/*} +else + ZTST_srcdir=$PWD +fi [[ $ZTST_srcdir = /* ]] || ZTST_srcdir="$ZTST_testdir/$ZTST_srcdir" # Set the function autoload paths to correspond to this build of zsh. -fpath=( $ZTST_srcdir/../(Completion|Functions)/*~*/CVS(/) ) +fpath=( $ZTST_srcdir/../Functions/*~*/CVS(/) + $ZTST_srcdir/../Completion + $ZTST_srcdir/../Completion/*/*~*/CVS(/) ) : ${TMPPREFIX:=/tmp/zsh} # Temporary files for redirection inside tests. @@ -66,7 +81,8 @@ ZTST_terr=${TMPPREFIX}.ztst.terr.$$ ZTST_cleanup() { cd $ZTST_testdir - rm -rf $ZTST_testdir/dummy.tmp $ZTST_testdir/*.tmp ${TMPPREFIX}.ztst*$$ + rm -rf $ZTST_testdir/dummy.tmp $ZTST_testdir/*.tmp(N) \ + ${TMPPREFIX}.ztst*$$(N) } # This cleanup always gets performed, even if we abort. Later, @@ -85,20 +101,27 @@ ZTST_testfailed() { print -r "Was testing: $ZTST_message" fi print -r "$ZTST_testname: test failed." - ZTST_cleanup - exit 1 + ZTST_testfailed=1 + return 1 } # Print messages if $ZTST_verbose is non-empty ZTST_verbose() { local lev=$1 shift - [[ -n $ZTST_verbose && $ZTST_verbose -ge $lev ]] && print -- $* >&8 + [[ -n $ZTST_verbose && $ZTST_verbose -ge $lev ]] && print -r -- $* >&8 +} +ZTST_hashmark() { + [[ ZTST_verbose -le 0 && -t 8 ]] && print -nu8 ${(pl:SECONDS::\#::\#\r:)} + (( SECONDS > COLUMNS+1 && (SECONDS -= COLUMNS) )) } -[[ ! -r $ZTST_testname ]] && ZTST_testfailed "can't read test file." +if [[ ! -r $ZTST_testname ]]; then + ZTST_testfailed "can't read test file." + exit 1 +fi -[[ -n $ZTST_verbose && $ZTST_verbose -ge 0 ]] && exec 8>&1 +exec 8>&1 exec 9<$ZTST_testname # The current line read from the test file. @@ -118,15 +141,18 @@ ZTST_getline() { # Get the name of the section. It may already have been read into # $curline, or we may have to skip some initial comments to find it. +# If argument present, it's OK to skip the reset of the current section, +# so no error if we find garbage. ZTST_getsect() { local match mbegin mend while [[ $ZTST_curline != '%'(#b)([[:alnum:]]##)* ]]; do ZTST_getline || return 1 [[ $ZTST_curline = [[:blank:]]# ]] && continue - if [[ $ZTST_curline != '%'[[:alnum:]]##* ]]; then + if [[ $# -eq 0 && $ZTST_curline != '%'[[:alnum:]]##* ]]; then ZTST_testfailed "bad line found before or after section: $ZTST_curline" + exit 1 fi done # have the next line ready waiting @@ -176,6 +202,7 @@ case $char in '?') fn=$ZTST_err ;; *) ZTST_testfailed "bad redir operator: $char" + return 1 ;; esac if [[ $ZTST_flags = *q* ]]; then @@ -183,6 +210,8 @@ if [[ $ZTST_flags = *q* ]]; then else print -r -- "$ZTST_redir" >>$fn fi + +return 0 } # Execute an indented chunk. Redirections will already have @@ -191,9 +220,10 @@ ZTST_execchunk() { options=($ZTST_testopts) eval "$ZTST_code" ZTST_status=$? + # careful... ksh_arrays may be in effect. + ZTST_testopts=(${(kv)options[*]}) + options=(${ZTST_mainopts[*]}) ZTST_verbose 2 "ZTST_execchunk: status $ZTST_status" - ZTST_testopts=(${(kv)options}) - options=($ZTST_mainopts) return $ZTST_status } @@ -208,6 +238,19 @@ $ZTST_code" done } +# diff wrapper +ZTST_diff() { + local diff_out diff_ret + + diff_out=$(diff "$@") + diff_ret="$?" + if [[ "$diff_ret" != "0" ]]; then + echo "$diff_out" + fi + + return "$diff_ret" +} + ZTST_test() { local last match mbegin mend found @@ -246,29 +289,33 @@ $ZTST_curline" else ZTST_testfailed "expecting test status at: $ZTST_curline" + return 1 fi ZTST_getline found=1 ;; - '<'*) ZTST_getredir + '<'*) ZTST_getredir || return 1 found=1 ;; - '>'*) ZTST_getredir + '>'*) ZTST_getredir || return 1 found=1 ;; - '?'*) ZTST_getredir + '?'*) ZTST_getredir || return 1 found=1 ;; *) ZTST_testfailed "bad line in test block: $ZTST_curline" + return 1 ;; esac done # If we found some code to execute... if [[ -n $ZTST_code ]]; then + ZTST_hashmark ZTST_verbose 1 "Running test: $ZTST_message" ZTST_verbose 2 "ZTST_test: expecting status: $ZTST_xstatus" + ZTST_verbose 2 "Input: $ZTST_in, output: $ZTST_out, error: $ZTST_terr" ZTST_execchunk <$ZTST_in >$ZTST_tout 2>$ZTST_terr @@ -278,6 +325,7 @@ $ZTST_curline" $ZTST_code${$(<$ZTST_terr):+ Error output: $(<$ZTST_terr)}" + return 1 fi ZTST_verbose 2 "ZTST_test: test produced standard output: @@ -286,15 +334,17 @@ ZTST_test: and standard error: $(<$ZTST_terr)" # Now check output and error. - if [[ $ZTST_flags != *d* ]] && ! diff -c $ZTST_out $ZTST_tout; then + if [[ $ZTST_flags != *d* ]] && ! ZTST_diff -c $ZTST_out $ZTST_tout; then ZTST_testfailed "output differs from expected as shown above for: $ZTST_code${$(<$ZTST_terr):+ Error output: $(<$ZTST_terr)}" + return 1 fi - if [[ $ZTST_flags != *D* ]] && ! diff -c $ZTST_err $ZTST_terr; then + if [[ $ZTST_flags != *D* ]] && ! ZTST_diff -c $ZTST_err $ZTST_terr; then ZTST_testfailed "error output differs from expected as shown above for: $ZTST_code" + return 1 fi fi ZTST_verbose 1 "Test successful." @@ -312,12 +362,16 @@ $ZTST_code" typeset -A ZTST_sects ZTST_sects=(prep 0 test 0 clean 0) +print "$ZTST_testname: starting." + # Now go through all the different sections until the end. -while ZTST_getsect; do +ZTST_skipok= +while ZTST_getsect $ZTST_skipok; do case $ZTST_cursect in prep) if (( ${ZTST_sects[prep]} + ${ZTST_sects[test]} + \ ${ZTST_sects[clean]} )); then ZTST_testfailed "\`prep' section must come first" + exit 1 fi ZTST_prepclean ZTST_sects[prep]=1 @@ -325,22 +379,28 @@ while ZTST_getsect; do test) if (( ${ZTST_sects[test]} + ${ZTST_sects[clean]} )); then ZTST_testfailed "bad placement of \`test' section" + exit 1 fi + # careful here: we can't execute ZTST_test before || or && + # because that affects the behaviour of traps in the tests. ZTST_test + (( $? )) && ZTST_skipok=1 ZTST_sects[test]=1 ;; clean) if (( ${ZTST_sects[test]} == 0 || ${ZTST_sects[clean]} )); then ZTST_testfailed "bad use of \`clean' section" + else + ZTST_prepclean 1 + ZTST_sects[clean]=1 fi - ZTST_prepclean 1 - ZTST_sects[clean]=1 + ZTST_skipok= ;; *) ZTST_testfailed "bad section name: $ZTST_cursect" ;; esac done -print "$ZTST_testname: all tests successful." +(( $ZTST_testfailed )) || print "$ZTST_testname: all tests successful." ZTST_cleanup -exit 0 +exit $(( ZTST_testfailed )) |