mirror of
https://github.com/etcd-io/etcd.git
synced 2024-09-27 06:25:44 +00:00
Merge pull request #7375 from heyitsanthony/fix-e2e-cov
e2e: fix -tags cov builds
This commit is contained in:
commit
15d8ca7726
@ -44,13 +44,16 @@ func spawnCmd(args []string) (*expect.ExpectProcess, error) {
|
|||||||
fmt.Sprintf("-test.coverprofile=e2e.%v.coverprofile", time.Now().UnixNano()),
|
fmt.Sprintf("-test.coverprofile=e2e.%v.coverprofile", time.Now().UnixNano()),
|
||||||
"-test.outputdir=" + coverPath,
|
"-test.outputdir=" + coverPath,
|
||||||
}
|
}
|
||||||
ep := expect.NewExpectWithEnv(binDir+"/etcd_test", covArgs, args2env(args[1:]))
|
ep, err := expect.NewExpectWithEnv(binDir+"/etcd_test", covArgs, args2env(args[1:]))
|
||||||
|
if err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
// ep sends SIGTERM to etcd_test process on ep.close()
|
// ep sends SIGTERM to etcd_test process on ep.close()
|
||||||
// allowing the process to exit gracefully in order to generate a coverage report.
|
// allowing the process to exit gracefully in order to generate a coverage report.
|
||||||
// note: go runtime ignores SIGINT but not SIGTERM
|
// note: go runtime ignores SIGINT but not SIGTERM
|
||||||
// if e2e test is run as a background process.
|
// if e2e test is run as a background process.
|
||||||
ep.StopSignal = syscall.SIGTERM
|
ep.StopSignal = syscall.SIGTERM
|
||||||
return nil, ep
|
return ep, nil
|
||||||
}
|
}
|
||||||
return expect.NewExpect(args[0], args[1:]...)
|
return expect.NewExpect(args[0], args[1:]...)
|
||||||
}
|
}
|
Loading…
x
Reference in New Issue
Block a user