Skip to content
Browse files

moved shell presence check after the shell separation header

git-svn-id: http://shflags.googlecode.com/svn/trunk/source/1.0@95 9d7cb843-df4f-0410-8a79-4785ae5a3405
  • Loading branch information...
1 parent 453d923 commit 52bf5c3cad06cb955f1a7f2842d3897fe227345e kate.ward@forestent.com committed
Showing with 7 additions and 8 deletions.
  1. +5 −6 src/shflags_test.sh
  2. +2 −2 src/shflags_test_private.sh
View
11 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}"`
View
4 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}"
}

0 comments on commit 52bf5c3

Please sign in to comment.
Something went wrong with that request. Please try again.