Fix binary paths when precompiling multiple suites.

rjacobs31 · onsi · commit 4df06c6d3b54 · 2025-03-05T10:20:20.000-07:00
diff --git a/ginkgo/build/build_command.go b/ginkgo/build/build_command.go
@@ -55,18 +55,20 @@ func buildSpecs(args []string, cliConfig types.CLIConfig, goFlagsConfig types.Go
 		if suite.State.Is(internal.TestSuiteStateFailedToCompile) {
 			fmt.Println(suite.CompilationError.Error())
 		} else {
-			if len(goFlagsConfig.O) == 0 {
-				goFlagsConfig.O = path.Join(suite.Path, suite.PackageName+".test")
-			} else {
+			var testBinPath string
+			if len(goFlagsConfig.O) != 0 {
 				stat, err := os.Stat(goFlagsConfig.O)
 				if err != nil {
 					panic(err)
 				}
 				if stat.IsDir() {
-					goFlagsConfig.O += "/" + suite.PackageName + ".test"
+					testBinPath = goFlagsConfig.O + "/" + suite.PackageName + ".test"
 				}
 			}
-			fmt.Printf("Compiled %s\n", goFlagsConfig.O)
+			if len(testBinPath) == 0 {
+				testBinPath = path.Join(suite.Path, suite.PackageName+".test")
+			}
+			fmt.Printf("Compiled %s\n", testBinPath)
 		}
 	}
 
diff --git a/integration/_fixtures/build_reporting_fixture/suite1/build_reporting_1_suite_test.go b/integration/_fixtures/build_reporting_fixture/suite1/build_reporting_1_suite_test.go
@@ -0,0 +1,13 @@
+package suite1_test
+
+import (
+	. "github.com/onsi/ginkgo/v2"
+	. "github.com/onsi/gomega"
+
+	"testing"
+)
+
+func TestAfterRunHook(t *testing.T) {
+	RegisterFailHandler(Fail)
+	RunSpecs(t, "Build reporting suite 1")
+}
diff --git a/integration/_fixtures/build_reporting_fixture/suite1/build_reporting_1_test.go b/integration/_fixtures/build_reporting_fixture/suite1/build_reporting_1_test.go
@@ -0,0 +1,18 @@
+package suite1_test
+
+import (
+	. "github.com/onsi/ginkgo/v2"
+	. "github.com/onsi/gomega"
+)
+
+var _ = Describe("Testing", func() {
+	It("it should succeed", func() {
+		Ω(true).Should(Equal(true))
+	})
+
+	PIt("a failing test", func() {
+		It("should fail", func() {
+			Ω(true).Should(Equal(false))
+		})
+	})
+})
diff --git a/integration/_fixtures/build_reporting_fixture/suite2/build_reporting_2_suite_test.go b/integration/_fixtures/build_reporting_fixture/suite2/build_reporting_2_suite_test.go
@@ -0,0 +1,13 @@
+package suite2_test
+
+import (
+	. "github.com/onsi/ginkgo/v2"
+	. "github.com/onsi/gomega"
+
+	"testing"
+)
+
+func TestAfterRunHook(t *testing.T) {
+	RegisterFailHandler(Fail)
+	RunSpecs(t, "Build reporting suite 1")
+}
diff --git a/integration/_fixtures/build_reporting_fixture/suite2/build_reporting_2_test.go b/integration/_fixtures/build_reporting_fixture/suite2/build_reporting_2_test.go
@@ -0,0 +1,18 @@
+package suite2_test
+
+import (
+	. "github.com/onsi/ginkgo/v2"
+	. "github.com/onsi/gomega"
+)
+
+var _ = Describe("Testing", func() {
+	It("it should succeed", func() {
+		Ω(true).Should(Equal(true))
+	})
+
+	PIt("a failing test", func() {
+		It("should fail", func() {
+			Ω(true).Should(Equal(false))
+		})
+	})
+})
diff --git a/integration/precompiled_test.go b/integration/precompiled_test.go
@@ -48,6 +48,19 @@ var _ = Describe("ginkgo build", func() {
 	})
 })
 
+var _ = Describe("ginkgo build with multiple suites", Label("build"), func() {
+	It("should correctly report multiple test binaries", func() {
+		fm.MountFixture("build_reporting")
+		session := startGinkgo(fm.PathTo("build_reporting"), "build", "-r")
+		Eventually(session).Should(gexec.Exit(0))
+		output := string(session.Out.Contents())
+		Ω(output).Should(ContainSubstring("Compiled suite1/suite1.test"))
+		Ω(output).Should(ContainSubstring("Compiled suite2/suite2.test"))
+		Ω(fm.PathTo("build_reporting", "suite1", "suite1.test")).Should(BeAnExistingFile())
+		Ω(fm.PathTo("build_reporting", "suite2", "suite2.test")).Should(BeAnExistingFile())
+	})
+})
+
 var _ = Describe("ginkgo build with custom output", Label("build"), func() {
 	const customPath = "mycustomdir"
 	var fullPath string

Original file line number	Diff line number	Diff line change
`@@ -55,18 +55,20 @@ func buildSpecs(args []string, cliConfig types.CLIConfig, goFlagsConfig types.Go`
`55`	`55`	`if suite.State.Is(internal.TestSuiteStateFailedToCompile) {`
`56`	`56`	`fmt.Println(suite.CompilationError.Error())`
`57`	`57`	`} else {`
`58`		`- if len(goFlagsConfig.O) == 0 {`
`59`		`- goFlagsConfig.O = path.Join(suite.Path, suite.PackageName+".test")`
`60`		`- } else {`
	`58`	`+ var testBinPath string`
	`59`	`+ if len(goFlagsConfig.O) != 0 {`
`61`	`60`	`stat, err := os.Stat(goFlagsConfig.O)`
`62`	`61`	`if err != nil {`
`63`	`62`	`panic(err)`
`64`	`63`	`}`
`65`	`64`	`if stat.IsDir() {`
`66`		`- goFlagsConfig.O += "/" + suite.PackageName + ".test"`
	`65`	`+ testBinPath = goFlagsConfig.O + "/" + suite.PackageName + ".test"`
`67`	`66`	`}`
`68`	`67`	`}`
`69`		`- fmt.Printf("Compiled %s\n", goFlagsConfig.O)`
	`68`	`+ if len(testBinPath) == 0 {`
	`69`	`+ testBinPath = path.Join(suite.Path, suite.PackageName+".test")`
	`70`	`+ }`
	`71`	`+ fmt.Printf("Compiled %s\n", testBinPath)`
`70`	`72`	`}`
`71`	`73`	`}`
`72`	`74`