Merge pull request #82 from grafana/feature/goflags

Update build flags to make `-trimpath` go flag configurable

builder.go

@@ -88,7 +88,7 @@ func (b Builder) Build(ctx context.Context, outputFile string) error {
 	raceArg := "-race"
 
 	// trim debug symbols by default
-	buildFlags := b.osEnvOrDefaultValue("XK6_BUILD_FLAGS", "-ldflags='-w -s'")
+	buildFlags := b.osEnvOrDefaultValue("XK6_BUILD_FLAGS", "-ldflags='-w -s' -trimpath")
 
 	buildFlagsSlice := buildCommandArgs(buildFlags, absOutputFile)
 
@@ -297,7 +297,6 @@ func buildCommandArgs(buildFlags, absOutputFile string) []string {
 	}
 
 	buildFlagsSlice = append(buildFlagsSlice, tmp...)
-	buildFlagsSlice = append(buildFlagsSlice, "-trimpath")
 
 	return buildFlagsSlice
 }

builder_test.go

@@ -100,31 +100,31 @@ func TestBuildCommandArgs(t *testing.T) {
 		{
 			buildFlags: "",
 			want: []string{
-				"build", "-o", "binfile", "-trimpath",
+				"build", "-o", "binfile",
 			},
 		},
 		{
 			buildFlags: "-ldflags='-w -s'",
 			want: []string{
-				"build", "-o", "binfile", "-ldflags=-w -s", "-trimpath",
+				"build", "-o", "binfile", "-ldflags=-w -s",
 			},
 		},
 		{
 			buildFlags: "-race -buildvcs=false",
 			want: []string{
-				"build", "-o", "binfile", "-race", "-buildvcs=false", "-trimpath",
+				"build", "-o", "binfile", "-race", "-buildvcs=false",
 			},
 		},
 		{
 			buildFlags: `-buildvcs=false -ldflags="-s -w" -race`,
 			want: []string{
-				"build", "-o", "binfile", "-buildvcs=false", "-ldflags=-s -w", "-race", "-trimpath",
+				"build", "-o", "binfile", "-buildvcs=false", "-ldflags=-s -w", "-race",
 			},
 		},
 		{
 			buildFlags: `-ldflags="-s -w" -race -buildvcs=false`,
 			want: []string{
-				"build", "-o", "binfile", "-ldflags=-s -w", "-race", "-buildvcs=false", "-trimpath",
+				"build", "-o", "binfile", "-ldflags=-s -w", "-race", "-buildvcs=false",
 			},
 		},
 	}