commit 229f5d3121ddd284bca76ec17c36fc8ed82d3aa7
author Joe Gregorio <jcgregorio@google.com> Fri Oct 07 13:00:11 2022 -0400
committer SkCQ <skcq-be@skia-corp.google.com.iam.gserviceaccount.com> Fri Oct 07 17:20:50 2022 +0000
tree a99543f7548c5e4dfd35f84bfaa1ec076639920a
parent af4f88ab7248e56e6557735774787152894d75bf

Fix common.MultiStringFlagVar.

Also add unit test.

Change-Id: I533f3f9d4fb1c589dbdeb79e9eac7b3287cf17a7
Reviewed-on: https://skia-review.googlesource.com/c/buildbot/+/588726
Reviewed-by: Eric Boren <borenet@google.com>
Auto-Submit: Joe Gregorio <jcgregorio@google.com>
Commit-Queue: Eric Boren <borenet@google.com>
Commit-Queue: Joe Gregorio <jcgregorio@google.com>

go/common/common.go

diff --git a/go/common/common.go b/go/common/common.go
index e8cd3d7..1c253cc 100644
--- a/go/common/common.go
+++ b/go/common/common.go
@@ -157,7 +157,7 @@
 // defaults, and usage string. The argument target points to a []string
 // variable in which to store the values of the flag.
 func MultiStringFlagVar(target *[]string, name string, defaults []string, usage string) {
-	FSNewMultiStringFlag(flag.CommandLine, name, defaults, usage)
+	FSMultiStringFlagVar(flag.CommandLine, target, name, defaults, usage)
 }
 
 // String() returns the current values of multiString, as a comma separated list

go/common/common_test.go

diff --git a/go/common/common_test.go b/go/common/common_test.go
index 8d1262c..a03da9f 100644
--- a/go/common/common_test.go
+++ b/go/common/common_test.go
@@ -2,6 +2,7 @@
 
 import (
 	"flag"
+	"os"
 	"reflect"
 	"testing"
 
@@ -71,3 +72,16 @@
 	}
 	require.Equal(t, "", z.Interface().(flag.Value).String())
 }
+
+const (
+	testFlagName = "my-test-flag"
+)
+
+func TestMultiStringFlagVar_FlagProvided_FlagValuesOverwriteDefaults(t *testing.T) {
+	target := []string{}
+	defaults := []string{"foo", "bar"}
+	MultiStringFlagVar(&target, testFlagName, defaults, "")
+	os.Args = []string{"exe", "--my-test-flag=baz"}
+	flag.Parse()
+	require.Equal(t, []string{"baz"}, target)
+}