diff options
| author | kate.ward <kate.ward@forestent.com> | 2008-11-12 20:13:28 +0000 |
|---|---|---|
| committer | kate.ward <kate.ward@forestent.com> | 2008-11-12 20:13:28 +0000 |
| commit | 31cb24f2ba51a35718f4262c9fc8ea27256cdf6a (patch) | |
| tree | f37cfa295feafb4747141e3baedbe921699f0cf7 /source | |
| parent | 60c2598774dc05d45af841fc6104607052f09cdc (diff) | |
| download | shflags-31cb24f2ba51a35718f4262c9fc8ea27256cdf6a.tar.gz | |
a few minor tweaks and convinence fixes
Diffstat (limited to 'source')
| -rw-r--r-- | source/1.0/src/shflags_test_helpers | 26 |
1 files changed, 19 insertions, 7 deletions
diff --git a/source/1.0/src/shflags_test_helpers b/source/1.0/src/shflags_test_helpers index 5c7533f..565ca2e 100644 --- a/source/1.0/src/shflags_test_helpers +++ b/source/1.0/src/shflags_test_helpers @@ -1,3 +1,4 @@ +# $Id$ # vim:et:ft=sh:sts=2:sw=2 # # Copyright 2008 Kate Ward. All Rights Reserved. @@ -9,6 +10,9 @@ __th_skipping=0 +# treat unset variables as an error +set -u + # set shwordsplit for zsh [ -n "${ZSH_VERSION:-}" ] && setopt shwordsplit @@ -48,7 +52,14 @@ th_showOutput() isSkipping if [ $? -eq ${SHUNIT_FALSE} -a ${_th_rtrn} != ${FLAGS_TRUE} ]; then - cat "${_th_stdout}" "${_th_stderr}" >&2 + if [ -n "${_th_stdout}" ]; then + echo '--- stdout ---' >&2 + cat "${_th_stdout}" >&2 + fi + if [ -n "${_th_stderr}" ]; then + echo '--- stderr ---' >&2 + cat "${_th_stderr}" >&2 + fi fi unset _th_rtrn _th_stdout _th_stderr @@ -60,16 +71,17 @@ _th_assertMsg() _th_alert_msg_=$2 _th_msg_=$3 - [ -n "${_th_msg_}" ] && _th_msg_="(${_th_msg_}) " case ${_th_alert_type_} in - WARN) _th_alert_str_='warning' ;; - ERROR) _th_alert_str_='error' ;; + WARN) _th_alert_str_='a warning' ;; + ERROR) _th_alert_str_='an error' ;; esac - grep -- "^flags:${_th_alert_type_} .* ${_th_alert_msg_}" "${stderrF}" \ + [ -z "${_th_alert_msg_}" ] && _th_alert_msg_='.*' + [ -n "${_th_msg_}" ] && _th_msg_="(${_th_msg_}) " + + grep -- "^flags:${_th_alert_type_} ${_th_alert_msg_}" "${stderrF}" \ >/dev/null assertTrue \ - "FLAGS ${_th_msg_}failure did not generate a ${_th_alert_str_} message" \ - $? + "FLAGS ${_th_msg_}failure did not generate ${_th_alert_str_} message" $? unset _th_alert_type_ _th_alert_msg_ _th_alert_str_ _th_msg_ } |