From 315877eae3b8b5b5878b35120a57ab9b0010ec6b Mon Sep 17 00:00:00 2001 From: Florent Poinsard Date: Wed, 23 Aug 2023 10:45:02 -0400 Subject: [PATCH 1/2] Skip VTAdmin build in Docker tests Signed-off-by: Florent Poinsard --- test.go | 3 +++ 1 file changed, 3 insertions(+) diff --git a/test.go b/test.go index 3955220842d..d5189e553a5 100755 --- a/test.go +++ b/test.go @@ -201,6 +201,9 @@ func (t *Test) run(dir, dataDir string) ([]byte, error) { } else { // If there is no cache, we have to call 'make build' before each test. args = []string{t.flavor, t.bootstrapVersion, "make build && " + testArgs} + if !*buildVTAdmin { + args[2] = "NOVTADMINBUILD=1 " + args[2] + } } cmd = exec.Command(path.Join(dir, "docker/test/run.sh"), args...) From e5c394236c88888eb00a6aa82e47f878d05e54a9 Mon Sep 17 00:00:00 2001 From: Florent Poinsard Date: Wed, 23 Aug 2023 15:07:15 -0400 Subject: [PATCH 2/2] use proper indexes to add value to the arg slice Signed-off-by: Florent Poinsard --- test.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test.go b/test.go index d5189e553a5..0177b0a525a 100755 --- a/test.go +++ b/test.go @@ -202,7 +202,7 @@ func (t *Test) run(dir, dataDir string) ([]byte, error) { // If there is no cache, we have to call 'make build' before each test. args = []string{t.flavor, t.bootstrapVersion, "make build && " + testArgs} if !*buildVTAdmin { - args[2] = "NOVTADMINBUILD=1 " + args[2] + args[len(args)-1] = "NOVTADMINBUILD=1 " + args[len(args)-1] } }