test impr open-telemetry#4

pdelewski · Aug 22, 2023 · 68c7276 · 68c7276
1 parent e3a7f81
commit 68c7276
Showing 1 changed file with 8 additions and 24 deletions.
diff --git a/instrgen/driver/instrgen_test.go b/instrgen/driver/instrgen_test.go
@@ -112,12 +112,8 @@ func TestToolExecMain(t *testing.T) {
 		files := alib.SearchFiles(k, ".go")
 		args = append(args, []string{"-o", "/tmp/go-build", "-p", "main", "-pack", "-asmhdr", "go_asm.h"}...)
 		args = append(args, files...)
-		var instrgenCfg InstrgenCmd
-		instrgenCfg.FilePattern = k
-		instrgenCfg.EntryPoint.Pkg = "main"
-		instrgenCfg.EntryPoint.FunName = "main"
-		instrgenCfg.Replace = "yes"
-		instrgenCfg.Cmd = "prune"
+		instrgenCfg := InstrgenCmd{FilePattern: k, Cmd: "prune", Replace: "yes",
+			EntryPoint: EntryPoint{Pkg: "main", FunName: "main"}}
 		rewriterS := makeRewriters(instrgenCfg)
 		analyze(args, rewriterS)
 		instrgenCfg.Cmd = "inject"
@@ -129,25 +125,17 @@ func TestToolExecMain(t *testing.T) {
 		files := alib.SearchFiles(k, ".go")
 		args = append(args, []string{"-pack", "-asmhdr", "go_asm.h"}...)
 		args = append(args, files...)
-		var instrgenCfg InstrgenCmd
-		instrgenCfg.FilePattern = k
-		instrgenCfg.EntryPoint.Pkg = "main"
-		instrgenCfg.EntryPoint.FunName = "main"
-		instrgenCfg.Replace = "no"
-		instrgenCfg.Cmd = "prune"
+		instrgenCfg := InstrgenCmd{FilePattern: k, Cmd: "prune", Replace: "no",
+			EntryPoint: EntryPoint{Pkg: "main", FunName: "main"}}
 		rewriterS := makeRewriters(instrgenCfg)
 		analyze(args, rewriterS)
 		instrgenCfg.Cmd = "inject"
 		rewriterS = makeRewriters(instrgenCfg)
 		analyze(args, rewriterS)
 	}
 	for k := range testcases {
-		var instrgenCfg InstrgenCmd
-		instrgenCfg.FilePattern = k
-		instrgenCfg.EntryPoint.Pkg = "main"
-		instrgenCfg.EntryPoint.FunName = "main"
-		instrgenCfg.Replace = "yes"
-		instrgenCfg.Cmd = "prune"
+		instrgenCfg := InstrgenCmd{FilePattern: k, Cmd: "prune", Replace: "yes",
+			EntryPoint: EntryPoint{Pkg: "main", FunName: "main"}}
 		rewriterS := makeRewriters(instrgenCfg)
 		var args []string
 		executor := &NullExecutor{}
@@ -196,12 +184,8 @@ func TestDriverMain(t *testing.T) {
 	{
 		var args []string
 		args = append(args, "compile")
-		var instrgenCfg InstrgenCmd
-		instrgenCfg.FilePattern = "/testdata/basic"
-		instrgenCfg.EntryPoint.Pkg = "main"
-		instrgenCfg.EntryPoint.FunName = "main"
-		instrgenCfg.Replace = "yes"
-		instrgenCfg.Cmd = "inject"
+		instrgenCfg := InstrgenCmd{FilePattern: "/testdata/basic", Cmd: "inject", Replace: "yes",
+			EntryPoint: EntryPoint{Pkg: "main", FunName: "main"}}
 		file, _ := json.MarshalIndent(instrgenCfg, "", " ")
 		err := os.WriteFile("instrgen_cmd.json", file, 0644)
 		require.NoError(t, err)