generic-library/vpx
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

tools_common.sh: add directory name to error output

Browse Source 
+ add a helper function to reduce the duplication

this is a bit clearer when the environment variable is set, but the
directory is missing

Change-Id: I08f9b56122b5741bb40a5f795f7f82f5b49f1047
This commit is contained in:
James Zern 2015-02-26 12:57:30 -08:00
parent 3e1d14a6ce
commit 2ebe0aee11
1 changed files with 14 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
test/tools_common.sh
View File

@ -106,22 +106,24 @@ check_git_hashes() {
fi fi
} }
# $1 is the name of an environment variable containing a directory name to
# test.
test_env_var_dir() {
local dir=$(eval echo "\${$1}")
if [ ! -d "${dir}" ]; then
elog "'${dir}': No such directory"
elog "The $1 environment variable must be set to a valid directory."
return 1
fi
}
# This script requires that the LIBVPX_BIN_PATH, LIBVPX_CONFIG_PATH, and # This script requires that the LIBVPX_BIN_PATH, LIBVPX_CONFIG_PATH, and
# LIBVPX_TEST_DATA_PATH variables are in the environment: Confirm that # LIBVPX_TEST_DATA_PATH variables are in the environment: Confirm that
# the variables are set and that they all evaluate to directory paths. # the variables are set and that they all evaluate to directory paths.
verify_vpx_test_environment() { verify_vpx_test_environment() {
if [ ! -d "${LIBVPX_BIN_PATH}" ]; then test_env_var_dir "LIBVPX_BIN_PATH" \
echo "The LIBVPX_BIN_PATH environment variable must be set." && test_env_var_dir "LIBVPX_CONFIG_PATH" \
return 1 && test_env_var_dir "LIBVPX_TEST_DATA_PATH"
fi
if [ ! -d "${LIBVPX_CONFIG_PATH}" ]; then
echo "The LIBVPX_CONFIG_PATH environment variable must be set."
return 1
fi
if [ ! -d "${LIBVPX_TEST_DATA_PATH}" ]; then
echo "The LIBVPX_TEST_DATA_PATH environment variable must be set."
return 1
fi
} }
# Greps vpx_config.h in LIBVPX_CONFIG_PATH for positional parameter one, which # Greps vpx_config.h in LIBVPX_CONFIG_PATH for positional parameter one, which