From 5f4f322ad4f9f1451c1e7cc85b29375fa62b79c4 Mon Sep 17 00:00:00 2001
From: Mauricio Poppe <mauriciopoppe@google.com>
Date: Thu, 1 Apr 2021 03:16:04 +0000
Subject: [PATCH] make program an array and keep ginkgo_args as it is

---
 hack/ginkgo-e2e.sh | 14 +++++---------
 1 file changed, 5 insertions(+), 9 deletions(-)

diff --git a/hack/ginkgo-e2e.sh b/hack/ginkgo-e2e.sh
index 8b877860b10..5a919c8914e 100755
--- a/hack/ginkgo-e2e.sh
+++ b/hack/ginkgo-e2e.sh
@@ -161,18 +161,14 @@ PATH=$(dirname "${e2e_test}"):"${PATH}"
 export PATH
 
 # Choose the program to execute.
-program="${ginkgo}"
-program_args="${ginkgo_args[@]}"
+program=("${ginkgo}")
 if [[ "${E2E_TEST_DEBUG_TOOL}" == "delve" ]]; then
-  program="dlv"
-  program_args=("exec")
-fi
-if [[ "${E2E_TEST_DEBUG_TOOL}" == "gdb" ]]; then
-  program="gdb"
-  program_args=("")
+  program=("dlv" "exec")
+elif [[ "${E2E_TEST_DEBUG_TOOL}" == "gdb" ]]; then
+  program=("gdb")
 fi
 
-"${program}" "${program_args[@]:+${program_args[@]}}" "${e2e_test}" -- \
+"${program[@]}" "${ginkgo_args[@]:+${ginkgo_args[@]}}" "${e2e_test}" -- \
   "${auth_config[@]:+${auth_config[@]}}" \
   --ginkgo.flakeAttempts="${FLAKE_ATTEMPTS}" \
   --host="${KUBE_MASTER_URL}" \