diff options
Diffstat (limited to 'test')
| -rwxr-xr-x | test/tools_common.sh | 26 |
1 files changed, 14 insertions, 12 deletions
diff --git a/test/tools_common.sh b/test/tools_common.sh index 8e8d78592..dffd4c491 100755 --- a/test/tools_common.sh +++ b/test/tools_common.sh @@ -106,22 +106,24 @@ check_git_hashes() { 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 # LIBVPX_TEST_DATA_PATH variables are in the environment: Confirm that # the variables are set and that they all evaluate to directory paths. verify_vpx_test_environment() { - if [ ! -d "${LIBVPX_BIN_PATH}" ]; then - echo "The LIBVPX_BIN_PATH environment variable must be set." - return 1 - 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 + test_env_var_dir "LIBVPX_BIN_PATH" \ + && test_env_var_dir "LIBVPX_CONFIG_PATH" \ + && test_env_var_dir "LIBVPX_TEST_DATA_PATH" } # Greps vpx_config.h in LIBVPX_CONFIG_PATH for positional parameter one, which |