Merge pull request #331 from kzys/fix-exit-code

kzys · web-flow · commit 6336eaaba392 · 2019-11-15T11:29:34.000-08:00
Fix exitCode()
diff --git a/runtime/service_integ_test.go b/runtime/service_integ_test.go
@@ -1107,7 +1107,9 @@ func TestUpdateVMMetadata_Isolated(t *testing.T) {
 
 func exitCode(err *exec.ExitError) int {
 	if status, ok := err.Sys().(syscall.WaitStatus); ok {
-		return int(status)
+		// As like Go 1.12's ExitStatus and WEXITSTATUS()
+		// https://github.com/golang/go/blob/3bea90d84107889aaaaa0089f615d7070951a832/src/syscall/syscall_linux.go#L301
+		return (int(status) & 0xff00) >> 8
 	}
 	return -1
 }

Original file line number	Diff line number	Diff line change
`@@ -1107,7 +1107,9 @@ func TestUpdateVMMetadata_Isolated(t *testing.T) {`
`1107`	`1107`
`1108`	`1108`	`func exitCode(err *exec.ExitError) int {`
`1109`	`1109`	`if status, ok := err.Sys().(syscall.WaitStatus); ok {`
`1110`		`- return int(status)`
	`1110`	`+ // As like Go 1.12's ExitStatus and WEXITSTATUS()`
	`1111`	`+ // https://github.com/golang/go/blob/3bea90d84107889aaaaa0089f615d7070951a832/src/syscall/syscall_linux.go#L301`
	`1112`	`+ return (int(status) & 0xff00) >> 8`
`1111`	`1113`	`}`
`1112`	`1114`	`return -1`
`1113`	`1115`	`}`