diff options
author | kate.ward <kate.ward@forestent.com> | 2008-11-15 20:06:54 +0000 |
---|---|---|
committer | kate.ward <kate.ward@forestent.com> | 2008-11-15 20:06:54 +0000 |
commit | a848e77567f210d83e98f6fce6e65c3764458218 (patch) | |
tree | 8b3eb7030565bee4e0f01a94d335b2a6c5b489a4 /source/1.0/src | |
parent | 14b33bf2243c200dcbe72f91f212240c3b7d5111 (diff) | |
download | shflags-a848e77567f210d83e98f6fce6e65c3764458218.tar.gz |
moved shell presence check after the shell separation header
Diffstat (limited to 'source/1.0/src')
-rwxr-xr-x | source/1.0/src/shflags_test.sh | 11 | ||||
-rwxr-xr-x | source/1.0/src/shflags_test_private.sh | 4 |
2 files changed, 7 insertions, 8 deletions
diff --git a/source/1.0/src/shflags_test.sh b/source/1.0/src/shflags_test.sh index c951483..3d2c335 100755 --- a/source/1.0/src/shflags_test.sh +++ b/source/1.0/src/shflags_test.sh @@ -94,18 +94,17 @@ uname -mprsv for shell in ${shells}; do echo - # check for existance of shell - if [ ! -x ${shell} ]; then - th_warn "unable to run tests with the ${shell} shell" - continue - fi - cat <<EOF #------------------------------------------------------------------------------ # Running the test suite with ${shell} # EOF + # check for existance of shell + if [ ! -x ${shell} ]; then + th_warn "unable to run tests with the ${shell} shell" + continue + fi shell_name=`basename ${shell}` shell_version=`versions_shellVersion "${shell}"` diff --git a/source/1.0/src/shflags_test_private.sh b/source/1.0/src/shflags_test_private.sh index db508a5..f145593 100755 --- a/source/1.0/src/shflags_test_private.sh +++ b/source/1.0/src/shflags_test_private.sh @@ -52,9 +52,9 @@ testItemInList() assertFalse 'empty lists should not match' $? } -testScreenColumns() +testColumns() { - cols=`_flags_screenColumns` + cols=`_flags_columns` value=`expr "${cols}" : '\([0-9]*\)'` assertNotNull "unexpected screen width (${cols})" "${value}" } |