diff --git a/scripts/test_cold_component_deadline.sh b/scripts/test_cold_component_deadline.sh index 70e322f..625f023 100755 --- a/scripts/test_cold_component_deadline.sh +++ b/scripts/test_cold_component_deadline.sh @@ -4,6 +4,12 @@ cd "$(dirname "$0")/.." test_name="component-deadline-test-$$" site_directory="${UCE_TEST_SITE_DIRECTORY:-site}" +if [[ -z "${UCE_TEST_SITE_DIRECTORY:-}" && -r /etc/uce/settings.cfg ]]; then + configured_site_directory=$(awk -F= '/^[[:space:]]*SITE_DIRECTORY[[:space:]]*=/ {gsub(/^[[:space:]]+|[[:space:]]+$/, "", $2); print $2; exit}' /etc/uce/settings.cfg) + if [[ -n "${configured_site_directory:-}" ]]; then + site_directory="$configured_site_directory" + fi +fi source_dir="$site_directory/$test_name" bin_directory="${BIN_DIRECTORY:-}" if [[ -z "$bin_directory" && -r /etc/uce/settings.cfg ]]; then diff --git a/scripts/test_dependency_invalidation.sh b/scripts/test_dependency_invalidation.sh index 4051e98..f6f9d8f 100755 --- a/scripts/test_dependency_invalidation.sh +++ b/scripts/test_dependency_invalidation.sh @@ -4,6 +4,12 @@ cd "$(dirname "$0")/.." test_name="dependency-cache-test-$$" site_directory="${UCE_TEST_SITE_DIRECTORY:-site}" +if [[ -z "${UCE_TEST_SITE_DIRECTORY:-}" && -r /etc/uce/settings.cfg ]]; then + configured_site_directory=$(awk -F= '/^[[:space:]]*SITE_DIRECTORY[[:space:]]*=/ {gsub(/^[[:space:]]+|[[:space:]]+$/, "", $2); print $2; exit}' /etc/uce/settings.cfg) + if [[ -n "${configured_site_directory:-}" ]]; then + site_directory="$configured_site_directory" + fi +fi source_dir="$site_directory/$test_name" bin_directory="${BIN_DIRECTORY:-}" if [[ -z "$bin_directory" && -r /etc/uce/settings.cfg ]]; then diff --git a/scripts/test_password_hashing.sh b/scripts/test_password_hashing.sh index 708bb9e..cdc3e9c 100755 --- a/scripts/test_password_hashing.sh +++ b/scripts/test_password_hashing.sh @@ -4,6 +4,12 @@ cd "$(dirname "$0")/.." test_name="password-hash-test-$$" site_directory="${UCE_TEST_SITE_DIRECTORY:-site}" +if [[ -z "${UCE_TEST_SITE_DIRECTORY:-}" && -r /etc/uce/settings.cfg ]]; then + configured_site_directory=$(awk -F= '/^[[:space:]]*SITE_DIRECTORY[[:space:]]*=/ {gsub(/^[[:space:]]+|[[:space:]]+$/, "", $2); print $2; exit}' /etc/uce/settings.cfg) + if [[ -n "${configured_site_directory:-}" ]]; then + site_directory="$configured_site_directory" + fi +fi source_dir="$site_directory/$test_name" bin_directory="${BIN_DIRECTORY:-}" if [[ -z "$bin_directory" && -r /etc/uce/settings.cfg ]]; then