diff options
| author | Pyry Haulos <phaulos@google.com> | 2016-02-08 18:43:40 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2016-02-08 18:43:40 +0000 |
| commit | 9d9760f9bec16c227d401024951bd331b88b40ba (patch) | |
| tree | 88a14b96abef33795fd95234d35a8bc6e5cc0fbd | |
| parent | a0b1c2dc04909436d2cc39f29f07e3c51f035e02 (diff) | |
| parent | e001096fc9f14d179242e8be4c6fc18010278639 (diff) | |
| download | cherry-9d9760f9bec16c227d401024951bd331b88b40ba.tar.gz | |
Merge "Use TargetPort for both host- and device-side ports on Android"
| -rw-r--r-- | cherry/adb.go | 12 | ||||
| -rw-r--r-- | cherry/testrunner.go | 2 |
2 files changed, 8 insertions, 6 deletions
diff --git a/cherry/adb.go b/cherry/adb.go index 2f1bb75..290e24d 100644 --- a/cherry/adb.go +++ b/cherry/adb.go @@ -338,17 +338,19 @@ func StartADBDeviceListPoller (rtdbServer *rtdb.Server, interval time.Duration) }() } -func LaunchAndroidExecServer (adbSerialNumber string, localPort int) error { +func LaunchAndroidExecServer (adbSerialNumber string, port int) error { + portSpec := "tcp:" + strconv.Itoa(port) + return runCommands( - exec.Command("adb", "-s", adbSerialNumber, "forward", "tcp:" + strconv.Itoa(localPort), "tcp:50016"), + exec.Command("adb", "-s", adbSerialNumber, "forward", portSpec, portSpec), exec.Command("adb", "-s", adbSerialNumber, "shell", "setprop", "log.tag.dEQP", "DEBUG"), - exec.Command("adb", "-s", adbSerialNumber, "shell", "am", "start", "-n", "com.drawelements.deqp/.execserver.ServiceStarter"), + exec.Command("adb", "-s", adbSerialNumber, "shell", "am", "start", "-n", "com.drawelements.deqp/.execserver.ServiceStarter", "--ei", "port", strconv.Itoa(port)), ) } -func RelaunchAndroidExecServer (adbSerialNumber string) error { +func RelaunchAndroidExecServer (adbSerialNumber string, port int) error { return runCommands( - exec.Command("adb", "-s", adbSerialNumber, "shell", "am", "start", "-n", "com.drawelements.deqp/.execserver.ServiceStarter"), + exec.Command("adb", "-s", adbSerialNumber, "shell", "am", "start", "-n", "com.drawelements.deqp/.execserver.ServiceStarter", "--ei", "port", strconv.Itoa(port)), ) } diff --git a/cherry/testrunner.go b/cherry/testrunner.go index 351db92..f210938 100644 --- a/cherry/testrunner.go +++ b/cherry/testrunner.go @@ -341,7 +341,7 @@ func (runner *TestRunner) executeBatch (batchResultId string, batchParams BatchE // If previous error was link error, relaunch execserver just to be sure if executionStatus == BATCH_EXEC_STATUS_LINK_ERROR && deviceConfig.IsADBDevice { appendRunnerLogLine("Relaunching execserver") - err := RelaunchAndroidExecServer(deviceConfig.ADBSerialNumber) + err := RelaunchAndroidExecServer(deviceConfig.ADBSerialNumber, batchParams.TargetPort) if err != nil { appendRunnerLogLine(fmt.Sprintf("Failed to relaunch ExecServer on Android via ADB: %v", err)) continue // Just try again, if tries left |