qbit/go
1
0
Fork 0
mirror of https://github.com/golang/go synced 2024-11-23 19:20:03 -07:00
Code Releases Activity

os: embed "sleep 1" within the test binary itself.

Browse Source 
This is an alternative to http://golang.org/cl/4150,
and is motivated by a review comment on that CL.

testKillProcess() tries to build and run the Go equivalent
for "sleep 1". This doesn't work for testing cross compilers
since the Go compiler is not available on the targets. This
change embeds the "sleep 1" functionality within the "os.test"
binary itself.

Change-Id: I6bad513deaa6c9e2704e70319098eb4983f1bb23
Reviewed-on: https://go-review.googlesource.com/4190
Reviewed-by: Ian Lance Taylor <iant@golang.org>
This commit is contained in:
Rahul Chaudhry 2015-02-08 07:42:10 -08:00 committed by Ian Lance Taylor
parent 6d06d4862d
commit afac4f0a40
1 changed files with 12 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
src/os/os_test.go
View File

@ -21,7 +21,6 @@ import (
"sync" "sync"
"syscall" "syscall"
"testing" "testing"
"text/template"
"time" "time"
) )
@ -1328,39 +1327,9 @@ func testKillProcess(t *testing.T, processKiller func(p *Process)) {
t.Skipf("skipping on %s", runtime.GOOS) t.Skipf("skipping on %s", runtime.GOOS)
} }
dir, err := ioutil.TempDir("", "go-build") // Re-exec the test binary itself to emulate "sleep 1".
if err != nil { cmd := osexec.Command(Args[0], "-test.run", "TestSleep")
t.Fatalf("Failed to create temp directory: %v", err) err := cmd.Start()
}
defer RemoveAll(dir)
src := filepath.Join(dir, "main.go")
f, err := Create(src)
if err != nil {
t.Fatalf("Failed to create %v: %v", src, err)
}
st := template.Must(template.New("source").Parse(`
package main
import "time"
func main() {
time.Sleep(time.Second)
}
`))
err = st.Execute(f, nil)
if err != nil {
f.Close()
t.Fatalf("Failed to execute template: %v", err)
}
f.Close()
exe := filepath.Join(dir, "main.exe")
output, err := osexec.Command("go", "build", "-o", exe, src).CombinedOutput()
if err != nil {
t.Fatalf("Failed to build exe %v: %v %v", exe, err, string(output))
}
cmd := osexec.Command(exe)
err = cmd.Start()
if err != nil { if err != nil {
t.Fatalf("Failed to start test process: %v", err) t.Fatalf("Failed to start test process: %v", err)
} }
@ -1374,6 +1343,15 @@ func main() {
} }
} }
// TestSleep emulates "sleep 1". It is a helper for testKillProcess, so we
// don't have to rely on an external "sleep" command being available.
func TestSleep(t *testing.T) {
if testing.Short() {
t.Skip("Skipping in short mode")
}
time.Sleep(time.Second)
}
func TestKillStartProcess(t *testing.T) { func TestKillStartProcess(t *testing.T) {
testKillProcess(t, func(p *Process) { testKillProcess(t, func(p *Process) {
err := p.Kill() err := p.Kill()