From 4d4026f5b0d63a19fbc24571b1509c48018f22c4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Hannes=20H=C3=B6rl?= Date: Wed, 29 Nov 2017 15:53:06 +0000 Subject: [PATCH] Make the framework test bash3 compatible --- pkg/framework/test/scripts/run-tests.sh | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/pkg/framework/test/scripts/run-tests.sh b/pkg/framework/test/scripts/run-tests.sh index 75bedead9..cf2e67602 100755 --- a/pkg/framework/test/scripts/run-tests.sh +++ b/pkg/framework/test/scripts/run-tests.sh @@ -4,18 +4,17 @@ set -eu # Use DEBUG=1 ./scripts/run-tests.sh to get debug output [[ -z "${DEBUG:-""}" ]] || set -x -declare -a ginkgo_args - +GINKGO="ginkgo" if [[ -n "${GINKGO_WATCH:-""}" ]] ; then - ginkgo_args=( "${ginkgo_args[@]}" "watch" ) + GINKGO="$GINKGO watch" fi if [[ -z ${GINKGO_PERFORMANCE:-""} ]] ; then - ginkgo_args=( "${ginkgo_args[@]}" "-skipMeasurements" ) + GINKGO="$GINKGO -skipMeasurements" fi test_framework_dir="$(cd "$(dirname "$0")/.." ; pwd)" export KUBE_ASSETS_DIR="${test_framework_dir}/assets/bin" -ginkgo "${ginkgo_args[@]}" -r "${test_framework_dir}" +$GINKGO -r "${test_framework_dir}"