test xds-server: explicitly kill process

[src/xds/xds-server.git] / test / xdsserver_test.go

diff --git a/test/xdsserver_test.go b/test/xdsserver_test.go
index b8e98b5..68206a9 100644 (file)
--- a/test/xdsserver_test.go
+++ b/test/xdsserver_test.go
@@ -47,6 +47,18 @@ var HTTPCli *common.HTTPClient
 var logDir string
 var sCli *IOSockClient
 
+func Debug(t *testing.T, args ...interface{}) {
+       if os.Getenv("VERBOSE") != "" {
+               t.Log(args)
+       }
+}
+
+func Debugf(t *testing.T, format string, args ...interface{}) {
+       if os.Getenv("VERBOSE") != "" {
+               t.Logf(format, args)
+       }
+}
+
 func Copy(src, dst string) error {
        in, err := os.Open(src)
        if err != nil {
@@ -192,7 +204,6 @@ func TestMain(m *testing.M) {
                                log.Fatalf("status=%v\n err=%v\n", status, err)
                        }
                }(proc)
-               defer proc.Kill()
                defer fileXdsServer.Close()
        }
        time.Sleep(1 * time.Second)
@@ -212,4 +223,5 @@ func TestMain(m *testing.M) {
        }
        res := m.Run()
        defer os.Exit(res)
+       proc.Kill()
 }