index : pacman | |
Archlinux32 fork of pacman | gitolite user |
summaryrefslogtreecommitdiff |
-rwxr-xr-x | test/scripts/human_to_size_test.sh | 7 | ||||
-rwxr-xr-x | test/scripts/parseopts_test.sh | 7 |
diff --git a/test/scripts/human_to_size_test.sh b/test/scripts/human_to_size_test.sh index 678fa876..63061372 100755 --- a/test/scripts/human_to_size_test.sh +++ b/test/scripts/human_to_size_test.sh @@ -3,11 +3,12 @@ declare -i testcount=0 fail=0 pass=0 total=15 # source the library function -if [[ -z $1 || ! -f $1 ]]; then - printf "Bail out! path to human_to_size library not provided or does not exist\n" +lib=${1:-${PMTEST_SCRIPTLIB_DIR}human_to_size.sh} +if [[ -z $lib || ! -f $lib ]]; then + echo "Bail out! human_to_size library ($lib) could not be located\n" exit 1 fi -. "$1" +. "$lib" if ! type -t human_to_size >/dev/null; then printf 'Bail out! human_to_size function not found\n' diff --git a/test/scripts/parseopts_test.sh b/test/scripts/parseopts_test.sh index 8df1908b..5ff4bc55 100755 --- a/test/scripts/parseopts_test.sh +++ b/test/scripts/parseopts_test.sh @@ -3,11 +3,12 @@ declare -i testcount=0 pass=0 fail=0 total=25 # source the library function -if [[ -z $1 || ! -f $1 ]]; then - printf "Bail out! path to parseopts library not provided or does not exist\n" +lib=${1:-${PMTEST_SCRIPTLIB_DIR}parseopts.sh} +if [[ -z $lib || ! -f $lib ]]; then + printf "Bail out! parseopts library ($lib) could not be located\n" exit 1 fi -. "$1" +. "$lib" if ! type -t parseopts >/dev/null; then printf 'Bail out! parseopts function not found\n' |