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

misc/ios: retry lldb launch if the iOS app is busy

Browse Source 
Sometimes, a newly installed the test app is not ready to launch
or the reported app path is stale. Pause and retry the launch if
the lldb script did not run the program.

Change-Id: Ic7745d4b5a02f2e3cb8134341859039812f65a65
Reviewed-on: https://go-review.googlesource.com/111216
Run-TryBot: Elias Naur <elias.naur@gmail.com>
TryBot-Result: Gobot Gobot <gobot@golang.org>
Reviewed-by: Brad Fitzpatrick <bradfitz@golang.org>
This commit is contained in:
Elias Naur 2018-05-03 11:43:25 +02:00
parent 64f715beb6
commit 4704149e04
1 changed files with 51 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

53
misc/ios/go_darwin_arm_exec.go
View File

@ -129,11 +129,6 @@ func runMain() (int, error) {
return 1, err
}
deviceApp, err := findDeviceAppPath(bundleID)
if err != nil {
return 1, err
}
if err := mountDevImage(); err != nil {
return 1, err
}
@ -144,7 +139,7 @@ func runMain() (int, error) {
}
defer closer()
if err := run(appdir, deviceApp, os.Args[2:]); err != nil {
if err := run(appdir, bundleID, os.Args[2:]); err != nil {
// If the lldb driver completed with an exit code, use that.
if err, ok := err.(*exec.ExitError); ok {
if ws, ok := err.Sys().(interface{ ExitStatus() int }); ok {
@ -408,14 +403,7 @@ func idevCmd(cmd *exec.Cmd) *exec.Cmd {
return cmd
}
func run(appdir, deviceapp string, args []string) error {
lldb := exec.Command(
"python",
"-", // Read script from stdin.
appdir,
deviceapp,
)
lldb.Args = append(lldb.Args, args...)
func run(appdir, bundleID string, args []string) error {
var env []string
for _, e := range os.Environ() {
// Don't override TMPDIR on the device.
@ -424,11 +412,39 @@ func run(appdir, deviceapp string, args []string) error {
}
env = append(env, e)
}
attempt := 0
for {
// The device app path is constant for a given installed app,
// but the device might not return a stale device path for
// a newly overwritten app, so retry the lookup as well.
deviceapp, err := findDeviceAppPath(bundleID)
if err != nil {
return err
}
lldb := exec.Command(
"python",
"-", // Read script from stdin.
appdir,
deviceapp,
)
lldb.Args = append(lldb.Args, args...)
lldb.Env = env
lldb.Stdin = strings.NewReader(lldbDriver)
lldb.Stdout = os.Stdout
lldb.Stderr = os.Stderr
return lldb.Run()
var out bytes.Buffer
lldb.Stderr = io.MultiWriter(&out, os.Stderr)
err = lldb.Run()
// If the program was not started it can be retried without papering over
// real test failures.
started := bytes.HasPrefix(out.Bytes(), []byte("lldb: running program"))
if started || err == nil || attempt == 5 {
return err
}
// Sometimes, the app was not yet ready to launch or the device path was
// stale. Retry.
attempt++
time.Sleep(5 * time.Second)
}
}
func copyLocalDir(dst, src string) error {
@ -665,11 +681,13 @@ for i in range(0, sigs.GetNumSignals()):
sigs.SetShouldNotify(sig, False)
event = lldb.SBEvent()
running = False
while True:
if not listener.WaitForEvent(1, event):
continue
if not lldb.SBProcess.EventIsProcessEvent(event):
continue
if running:
# Pass through stdout and stderr.
while True:
out = process.GetSTDOUT(8192)
@ -691,6 +709,9 @@ while True:
process.Kill()
debugger.Terminate()
sys.exit(1)
# Tell the Go driver that the program is running and should not be retried.
sys.stderr.write("lldb: running program\n")
running = True
# Process stops once at the beginning. Continue.
process.Continue()