internal/testsuite: add additional environment

This improves compatibility. This change also improves error messages.

Signed-off-by: Ophestra <cat@gensokyo.uk>

1 files changed, 6 insertions, 6 deletions

diff --git a/cmd/hakurei/testsuite/sandbox/main.go b/cmd/hakurei/testsuite/sandbox/main.go
index 1d3d4516..820b7e2f 100644
--- a/cmd/hakurei/testsuite/sandbox/main.go
+++ b/cmd/hakurei/testsuite/sandbox/main.go
@@ -65,9 +65,9 @@ func mustStart(
 		select {
 		case err := <-done:
 			if err == nil {
-				log.Fatal("test process terminated unexpectedly")
+				log.Fatalf("test process %d terminated unexpectedly", serial)
 			}
-			log.Fatal(err)
+			log.Fatalf("test process %d terminated unexpectedly: %v", serial, err)
 		default:
 			break
 		}
@@ -117,7 +117,7 @@ func main() {
 		log.Fatal(err)
 	}
 
-	var testToolDone <-chan error
+	var testHelperDone <-chan error
 	{
 		cmd := exec.Command(
 			"go", "build",
@@ -127,7 +127,7 @@ func main() {
 			"./cmd/hakurei/testsuite/sandbox/tester",
 		)
 		cmd.Stdout, cmd.Stderr = os.Stdout, os.Stderr
-		testToolDone = testsuite.MustStart(cmd)
+		testHelperDone = testsuite.MustStart(cmd)
 	}
 
 	var wg sync.WaitGroup
@@ -232,8 +232,8 @@ func main() {
 	defer testsuite.TerminateSway(&cred)
 	testsuite.MustStartPipeWire(&cred, dbusEnv)
 
-	if err := <-testToolDone; err != nil {
-		log.Fatal(err)
+	if err := <-testHelperDone; err != nil {
+		log.Fatalf("cannot compile test helper: %v", err)
 	}
 	log.Println("created test helper")