diff options
| -rwxr-xr-x | shflags_private_test.sh | 2 | ||||
| -rwxr-xr-x | shflags_public_test.sh | 4 | ||||
| -rw-r--r-- | shflags_test_helpers | 23 | ||||
| -rwxr-xr-x | test_runner | 26 |
4 files changed, 29 insertions, 26 deletions
diff --git a/shflags_private_test.sh b/shflags_private_test.sh index 50ea4e2..b80c177 100755 --- a/shflags_private_test.sh +++ b/shflags_private_test.sh @@ -69,7 +69,7 @@ _testGenOptStr() { short=$1 long=$2 - result=$(_flags_genOptStr "${__FLAGS_OPTSTR_SHORT}") + result=`_flags_genOptStr "${__FLAGS_OPTSTR_SHORT}"` assertTrue 'short option string generation failed' $? assertEquals "${short}" "${result}" diff --git a/shflags_public_test.sh b/shflags_public_test.sh index 41eacba..e070be0 100755 --- a/shflags_public_test.sh +++ b/shflags_public_test.sh @@ -168,13 +168,13 @@ testNoHelp() { testLoggingLevel() { # Check that the default logging level is set properly. - got=$(flags_loggingLevel) want=${__FLAGS_LEVEL_DEFAULT} + got=`flags_loggingLevel` want=${__FLAGS_LEVEL_DEFAULT} assertTrue "Unexpected default logging level = ${got}, want ${want}" "[ ${got} -eq ${want} ]" # Override the logging level, and check again. flags_setLoggingLevel "${FLAGS_LEVEL_FATAL}" flags_setLoggingLevel "${FLAGS_LEVEL_INFO}" - got=$(flags_loggingLevel) want=${FLAGS_LEVEL_INFO} + got=`flags_loggingLevel` want=${FLAGS_LEVEL_INFO} assertTrue "Unexpected configured logging level = ${got}, want ${want}" "[ ${got} -eq ${want} ]" } diff --git a/shflags_test_helpers b/shflags_test_helpers index af3db24..d25976e 100644 --- a/shflags_test_helpers +++ b/shflags_test_helpers @@ -35,17 +35,20 @@ TH_MY_NAME=`basename "$0"` || th_fatal 'Error executing basename.' export TH_MY_NAME # Path to shFlags library. Can be overridden by setting SHFLAGS_INC. -export TH_SHFLAGS=${SHFLAGS_INC:-./shflags} +TH_SHFLAGS=${SHFLAGS_INC:-./shflags}; export TH_SHFLAGS # Path to shUnit2 library. Can be overridden by setting SHUNIT_INC. -export TH_SHUNIT=${SHUNIT_INC:-lib/shunit2} - -export TH_BOOL_VALID='true t 0 false f 1' -export TH_BOOL_INVALID='123 123.0 invalid' -export TH_FLOAT_VALID='-1234.0 -1.0 -.123 0.0 0. .123 1.0 1234.0' -export TH_FLOAT_INVALID='true false 1.2.3 -1.2.3 ""' -export TH_INT_VALID='-1234 -1 0 1 1234' -export TH_INT_INVALID='true false -1.0 -.123 0.0 .123 1.0 ""' +TH_SHUNIT=${SHUNIT_INC:-lib/shunit2}; export TH_SHUNIT + +TH_BOOL_VALID='true t 0 false f 1' +TH_BOOL_INVALID='123 123.0 invalid' +export TH_BOOL_VALID TH_BOOL_INVALID +TH_FLOAT_VALID='-1234.0 -1.0 -.123 0.0 0. .123 1.0 1234.0' +TH_FLOAT_INVALID='true false 1.2.3 -1.2.3 ""' +export TH_FLOAT_VALID TH_FLOAT_INVALID +TH_INT_VALID='-1234 -1 0 1 1234' +TH_INT_INVALID='true false -1.0 -.123 0.0 .123 1.0 ""' +export TH_INT_VALID TH_INT_INVALID # # Test helper functions. @@ -58,7 +61,7 @@ th_oneTimeSetUp() { . "${TH_SHFLAGS}" # These files will be cleaned up automatically by shUnit2. - export tmpDir=${SHUNIT_TMPDIR} + tmpDir=${SHUNIT_TMPDIR}; export tmpDir stdoutF="${tmpDir}/stdout" && touch "${stdoutF}" stderrF="${tmpDir}/stderr" && touch "${stderrF}" returnF="${tmpDir}/return" && touch "${returnF}" diff --git a/test_runner b/test_runner index 7207e14..1c43c4a 100755 --- a/test_runner +++ b/test_runner @@ -22,7 +22,7 @@ [ -z "${RUNNER_LOADED:-}" ] || return 0 RUNNER_LOADED=0 -RUNNER_ARGV0=$(basename "$0") +RUNNER_ARGV0=`basename "$0"` RUNNER_SHELLS='/bin/sh ash /bin/bash /bin/dash /bin/ksh /bin/pdksh /bin/zsh' RUNNER_TEST_SUFFIX='_test.sh' @@ -37,7 +37,7 @@ runner_usage() { _runner_tests() { echo ./*${RUNNER_TEST_SUFFIX} |sed 's#./##g'; } _runner_testName() { # shellcheck disable=SC1117 - _runner_testName_=$(expr "${1:-}" : "\(.*\)${RUNNER_TEST_SUFFIX}") + _runner_testName_=`expr "${1:-}" : "\(.*\)${RUNNER_TEST_SUFFIX}"` if [ -n "${_runner_testName_}" ]; then echo "${_runner_testName_}" else @@ -63,8 +63,8 @@ main() { while getopts 'e:hs:t:' opt; do case ${opt} in e) # set an environment variable - key=$(expr "${OPTARG}" : '\([^=]*\)=') - val=$(expr "${OPTARG}" : '[^=]*=\(.*\)') + key=`expr "${OPTARG}" : '\([^=]*\)='` + val=`expr "${OPTARG}" : '[^=]*=\(.*\)'` # shellcheck disable=SC2166 if [ -z "${key}" -o -z "${val}" ]; then runner_usage @@ -80,11 +80,11 @@ main() { *) runner_usage; exit 1 ;; esac done - shift "$(expr ${OPTIND} - 1)" + shift "`expr ${OPTIND} - 1`" # Fill shells and/or tests. shells=${shells:-${RUNNER_SHELLS}} - tests=${tests:-$(_runner_tests)} + [ -z "${tests}" ] && tests=`_runner_tests` # Error checking. if [ -z "${tests}" ]; then @@ -98,10 +98,10 @@ main() { # $ uname -mprsv -$(uname -mprsv) +`uname -mprsv` -OS Name: $(versions_osName) -OS Version: $(versions_osVersion) +OS Name: `versions_osName` +OS Version: `versions_osVersion` ### Test run info. shells: ${shells} @@ -128,14 +128,14 @@ EOF shell_present=${FALSE} case ${shell} in ash) - shell_bin=$(which busybox) + shell_bin=`which busybox` [ $? -eq "${TRUE}" ] && shell_present="${TRUE}" shell_bin="${shell_bin} ash" shell_name=${shell} ;; *) [ -x "${shell_bin}" ] && shell_present="${TRUE}" - shell_name=$(basename "${shell}") + shell_name=`basename "${shell}"` ;; esac if [ "${shell_present}" -eq "${FALSE}" ]; then @@ -143,7 +143,7 @@ EOF continue fi - shell_version=$(versions_shellVersion "${shell}") + shell_version=`versions_shellVersion "${shell}"` echo "shell name: ${shell_name}" echo "shell version: ${shell_version}" @@ -151,7 +151,7 @@ EOF # Execute the tests. for t in ${tests}; do echo - echo "--- Executing the '$(_runner_testName "${t}'")' test suite. ---" + echo "--- Executing the '`_runner_testName "${t}"`' test suite. ---" # ${shell_bin} needs word splitting. # shellcheck disable=SC2086 ( exec ${shell_bin} "./${t}" 2>&1; ) |