2015-03-01 11:47:54 -07:00
|
|
|
// Copyright 2015 The Go Authors. All rights reserved.
|
|
|
|
// Use of this source code is governed by a BSD-style
|
|
|
|
// license that can be found in the LICENSE file.
|
|
|
|
|
|
|
|
// This program can be used as go_darwin_arm_exec by the Go tool.
|
|
|
|
// It executes binaries on an iOS device using the XCode toolchain
|
|
|
|
// and the ios-deploy program: https://github.com/phonegap/ios-deploy
|
2015-03-06 07:45:24 -07:00
|
|
|
//
|
|
|
|
// This script supports an extra flag, -lldb, that pauses execution
|
|
|
|
// just before the main program begins and allows the user to control
|
|
|
|
// the remote lldb session. This flag is appended to the end of the
|
|
|
|
// script's arguments and is not passed through to the underlying
|
|
|
|
// binary.
|
2015-04-13 12:31:41 -06:00
|
|
|
//
|
|
|
|
// This script requires that three environment variables be set:
|
|
|
|
// GOIOS_DEV_ID: The codesigning developer id or certificate identifier
|
|
|
|
// GOIOS_APP_ID: The provisioning app id prefix. Must support wildcard app ids.
|
|
|
|
// GOIOS_TEAM_ID: The team id that owns the app id prefix.
|
|
|
|
// $GOROOT/misc/ios contains a script, detect.go, that attempts to autodetect these.
|
2015-03-01 11:47:54 -07:00
|
|
|
package main
|
|
|
|
|
|
|
|
import (
|
|
|
|
"bytes"
|
|
|
|
"errors"
|
|
|
|
"flag"
|
|
|
|
"fmt"
|
|
|
|
"go/build"
|
2015-03-06 07:45:24 -07:00
|
|
|
"io"
|
2015-03-01 11:47:54 -07:00
|
|
|
"io/ioutil"
|
|
|
|
"log"
|
|
|
|
"os"
|
|
|
|
"os/exec"
|
|
|
|
"path/filepath"
|
|
|
|
"runtime"
|
|
|
|
"strings"
|
|
|
|
"sync"
|
2016-03-24 09:03:07 -06:00
|
|
|
"syscall"
|
2015-03-01 11:47:54 -07:00
|
|
|
"time"
|
|
|
|
)
|
|
|
|
|
|
|
|
const debug = false
|
|
|
|
|
2015-03-30 06:36:37 -06:00
|
|
|
var errRetry = errors.New("failed to start test harness (retry attempted)")
|
|
|
|
|
|
|
|
var tmpdir string
|
|
|
|
|
2015-04-13 12:31:41 -06:00
|
|
|
var (
|
2017-02-01 01:37:47 -07:00
|
|
|
devID string
|
|
|
|
appID string
|
|
|
|
teamID string
|
|
|
|
bundleID string
|
2015-04-13 12:31:41 -06:00
|
|
|
)
|
|
|
|
|
2016-03-25 08:40:44 -06:00
|
|
|
// lock is a file lock to serialize iOS runs. It is global to avoid the
|
|
|
|
// garbage collector finalizing it, closing the file and releasing the
|
|
|
|
// lock prematurely.
|
|
|
|
var lock *os.File
|
|
|
|
|
2015-03-01 11:47:54 -07:00
|
|
|
func main() {
|
|
|
|
log.SetFlags(0)
|
|
|
|
log.SetPrefix("go_darwin_arm_exec: ")
|
|
|
|
if debug {
|
|
|
|
log.Println(strings.Join(os.Args, " "))
|
|
|
|
}
|
|
|
|
if len(os.Args) < 2 {
|
|
|
|
log.Fatal("usage: go_darwin_arm_exec a.out")
|
|
|
|
}
|
|
|
|
|
2015-05-04 10:41:41 -06:00
|
|
|
// e.g. B393DDEB490947F5A463FD074299B6C0AXXXXXXX
|
2015-04-13 12:31:41 -06:00
|
|
|
devID = getenv("GOIOS_DEV_ID")
|
2015-05-04 10:41:41 -06:00
|
|
|
|
|
|
|
// e.g. Z8B3JBXXXX.org.golang.sample, Z8B3JBXXXX prefix is available at
|
|
|
|
// https://developer.apple.com/membercenter/index.action#accountSummary as Team ID.
|
2015-04-13 12:31:41 -06:00
|
|
|
appID = getenv("GOIOS_APP_ID")
|
2015-05-04 10:41:41 -06:00
|
|
|
|
|
|
|
// e.g. Z8B3JBXXXX, available at
|
|
|
|
// https://developer.apple.com/membercenter/index.action#accountSummary as Team ID.
|
2015-04-13 12:31:41 -06:00
|
|
|
teamID = getenv("GOIOS_TEAM_ID")
|
|
|
|
|
2017-02-01 01:37:47 -07:00
|
|
|
parts := strings.SplitN(appID, ".", 2)
|
|
|
|
// For compatibility with the old builders, use a fallback bundle ID
|
|
|
|
bundleID = "golang.gotest"
|
|
|
|
if len(parts) == 2 {
|
|
|
|
bundleID = parts[1]
|
|
|
|
}
|
|
|
|
|
2015-03-30 06:36:37 -06:00
|
|
|
var err error
|
|
|
|
tmpdir, err = ioutil.TempDir("", "go_darwin_arm_exec_")
|
|
|
|
if err != nil {
|
|
|
|
log.Fatal(err)
|
2015-03-01 11:47:54 -07:00
|
|
|
}
|
|
|
|
|
2016-03-24 09:03:07 -06:00
|
|
|
// This wrapper uses complicated machinery to run iOS binaries. It
|
|
|
|
// works, but only when running one binary at a time.
|
|
|
|
// Use a file lock to make sure only one wrapper is running at a time.
|
|
|
|
//
|
|
|
|
// The lock file is never deleted, to avoid concurrent locks on distinct
|
|
|
|
// files with the same path.
|
|
|
|
lockName := filepath.Join(os.TempDir(), "go_darwin_arm_exec.lock")
|
2016-03-25 08:40:44 -06:00
|
|
|
lock, err = os.OpenFile(lockName, os.O_CREATE|os.O_RDONLY, 0666)
|
2016-03-24 09:03:07 -06:00
|
|
|
if err != nil {
|
|
|
|
log.Fatal(err)
|
|
|
|
}
|
|
|
|
if err := syscall.Flock(int(lock.Fd()), syscall.LOCK_EX); err != nil {
|
|
|
|
log.Fatal(err)
|
|
|
|
}
|
2015-03-30 06:36:37 -06:00
|
|
|
// Approximately 1 in a 100 binaries fail to start. If it happens,
|
|
|
|
// try again. These failures happen for several reasons beyond
|
|
|
|
// our control, but all of them are safe to retry as they happen
|
2017-03-03 17:44:45 -07:00
|
|
|
// before lldb encounters the initial getwd breakpoint. As we
|
2015-03-30 06:36:37 -06:00
|
|
|
// know the tests haven't started, we are not hiding flaky tests
|
|
|
|
// with this retry.
|
|
|
|
for i := 0; i < 5; i++ {
|
|
|
|
if i > 0 {
|
|
|
|
fmt.Fprintln(os.Stderr, "start timeout, trying again")
|
|
|
|
}
|
|
|
|
err = run(os.Args[1], os.Args[2:])
|
|
|
|
if err == nil || err != errRetry {
|
|
|
|
break
|
2015-03-03 15:54:42 -07:00
|
|
|
}
|
2015-03-01 11:47:54 -07:00
|
|
|
}
|
2015-03-03 15:54:42 -07:00
|
|
|
if !debug {
|
2015-03-30 06:36:37 -06:00
|
|
|
os.RemoveAll(tmpdir)
|
2015-03-03 15:54:42 -07:00
|
|
|
}
|
2015-03-30 06:36:37 -06:00
|
|
|
if err != nil {
|
|
|
|
fmt.Fprintf(os.Stderr, "go_darwin_arm_exec: %v\n", err)
|
|
|
|
os.Exit(1)
|
|
|
|
}
|
|
|
|
}
|
2015-03-01 11:47:54 -07:00
|
|
|
|
2015-04-13 12:31:41 -06:00
|
|
|
func getenv(envvar string) string {
|
|
|
|
s := os.Getenv(envvar)
|
|
|
|
if s == "" {
|
2015-11-02 15:37:31 -07:00
|
|
|
log.Fatalf("%s not set\nrun $GOROOT/misc/ios/detect.go to attempt to autodetect", envvar)
|
2015-04-13 12:31:41 -06:00
|
|
|
}
|
|
|
|
return s
|
|
|
|
}
|
|
|
|
|
2015-03-30 06:36:37 -06:00
|
|
|
func run(bin string, args []string) (err error) {
|
2015-03-01 11:47:54 -07:00
|
|
|
appdir := filepath.Join(tmpdir, "gotest.app")
|
2015-03-30 06:36:37 -06:00
|
|
|
os.RemoveAll(appdir)
|
2015-03-01 11:47:54 -07:00
|
|
|
if err := os.MkdirAll(appdir, 0755); err != nil {
|
|
|
|
return err
|
|
|
|
}
|
|
|
|
|
|
|
|
if err := cp(filepath.Join(appdir, "gotest"), bin); err != nil {
|
|
|
|
return err
|
|
|
|
}
|
|
|
|
|
misc/ios,cmd/go, runtime/cgo: fix iOS test harness (again)
The iOS test harness was recently changed in response to lldb bugs
to replace breakpoints with the SIGUSR2 signal (CL 34926), and to
pass the current directory in the test binary arguments (CL 35152).
Both the signal sending and working directory setup is done from
the go test driver.
However, the new method doesn't work with tests where a C program is
the test driver instead of go test: the current working directory
will not be changed and SIGUSR2 is not raised.
Instead of copying that logic into any C test program, rework the
test harness (again) to move the setup logic to the early runtime
cgo setup code. That way, the harness will run even in the library
build modes.
Then, use the app Info.plist file to pass the working
directory, removing the need to alter the arguments after running.
Finally, use the SIGINT signal instead of SIGUSR2 to avoid
manipulating the signal masks or handlers.
Fixes the testcarchive tests on iOS.
With this CL, both darwin/arm and darwin/arm64 passes all.bash.
This CL replaces CL 34926, CL 35152 as well as the fixup CL
35123 and CL 35255. They are reverted in CLs earlier in the
relation chain.
Change-Id: I8485c7db1404fbd8daa261efd1ea89e905121a3e
Reviewed-on: https://go-review.googlesource.com/36090
Run-TryBot: Elias Naur <elias.naur@gmail.com>
TryBot-Result: Gobot Gobot <gobot@golang.org>
Reviewed-by: David Crawshaw <crawshaw@golang.org>
2017-02-01 08:04:07 -07:00
|
|
|
pkgpath, err := copyLocalData(appdir)
|
|
|
|
if err != nil {
|
|
|
|
return err
|
|
|
|
}
|
|
|
|
|
2015-03-01 11:47:54 -07:00
|
|
|
entitlementsPath := filepath.Join(tmpdir, "Entitlements.plist")
|
2015-04-13 12:31:41 -06:00
|
|
|
if err := ioutil.WriteFile(entitlementsPath, []byte(entitlementsPlist()), 0744); err != nil {
|
2015-03-01 11:47:54 -07:00
|
|
|
return err
|
|
|
|
}
|
misc/ios,cmd/go, runtime/cgo: fix iOS test harness (again)
The iOS test harness was recently changed in response to lldb bugs
to replace breakpoints with the SIGUSR2 signal (CL 34926), and to
pass the current directory in the test binary arguments (CL 35152).
Both the signal sending and working directory setup is done from
the go test driver.
However, the new method doesn't work with tests where a C program is
the test driver instead of go test: the current working directory
will not be changed and SIGUSR2 is not raised.
Instead of copying that logic into any C test program, rework the
test harness (again) to move the setup logic to the early runtime
cgo setup code. That way, the harness will run even in the library
build modes.
Then, use the app Info.plist file to pass the working
directory, removing the need to alter the arguments after running.
Finally, use the SIGINT signal instead of SIGUSR2 to avoid
manipulating the signal masks or handlers.
Fixes the testcarchive tests on iOS.
With this CL, both darwin/arm and darwin/arm64 passes all.bash.
This CL replaces CL 34926, CL 35152 as well as the fixup CL
35123 and CL 35255. They are reverted in CLs earlier in the
relation chain.
Change-Id: I8485c7db1404fbd8daa261efd1ea89e905121a3e
Reviewed-on: https://go-review.googlesource.com/36090
Run-TryBot: Elias Naur <elias.naur@gmail.com>
TryBot-Result: Gobot Gobot <gobot@golang.org>
Reviewed-by: David Crawshaw <crawshaw@golang.org>
2017-02-01 08:04:07 -07:00
|
|
|
if err := ioutil.WriteFile(filepath.Join(appdir, "Info.plist"), []byte(infoPlist(pkgpath)), 0744); err != nil {
|
2015-03-01 11:47:54 -07:00
|
|
|
return err
|
|
|
|
}
|
|
|
|
if err := ioutil.WriteFile(filepath.Join(appdir, "ResourceRules.plist"), []byte(resourceRules), 0744); err != nil {
|
|
|
|
return err
|
|
|
|
}
|
|
|
|
|
|
|
|
cmd := exec.Command(
|
|
|
|
"codesign",
|
|
|
|
"-f",
|
2015-04-13 12:31:41 -06:00
|
|
|
"-s", devID,
|
2015-03-01 11:47:54 -07:00
|
|
|
"--entitlements", entitlementsPath,
|
|
|
|
appdir,
|
|
|
|
)
|
|
|
|
if debug {
|
|
|
|
log.Println(strings.Join(cmd.Args, " "))
|
|
|
|
}
|
|
|
|
cmd.Stdout = os.Stdout
|
|
|
|
cmd.Stderr = os.Stderr
|
|
|
|
if err := cmd.Run(); err != nil {
|
|
|
|
return fmt.Errorf("codesign: %v", err)
|
|
|
|
}
|
|
|
|
|
2015-03-30 06:36:37 -06:00
|
|
|
oldwd, err := os.Getwd()
|
|
|
|
if err != nil {
|
|
|
|
return err
|
|
|
|
}
|
|
|
|
if err := os.Chdir(filepath.Join(appdir, "..")); err != nil {
|
2015-03-01 11:47:54 -07:00
|
|
|
return err
|
|
|
|
}
|
2015-03-30 06:36:37 -06:00
|
|
|
defer os.Chdir(oldwd)
|
|
|
|
|
2016-03-23 09:17:44 -06:00
|
|
|
// Setting up lldb is flaky. The test binary itself runs when
|
|
|
|
// started is set to true. Everything before that is considered
|
|
|
|
// part of the setup and is retried.
|
|
|
|
started := false
|
2015-03-30 06:36:37 -06:00
|
|
|
defer func() {
|
|
|
|
if r := recover(); r != nil {
|
|
|
|
if w, ok := r.(waitPanic); ok {
|
|
|
|
err = w.err
|
2016-03-23 09:17:44 -06:00
|
|
|
if !started {
|
|
|
|
fmt.Printf("lldb setup error: %v\n", err)
|
|
|
|
err = errRetry
|
|
|
|
}
|
2015-03-30 06:36:37 -06:00
|
|
|
return
|
|
|
|
}
|
|
|
|
panic(r)
|
|
|
|
}
|
|
|
|
}()
|
|
|
|
|
|
|
|
defer exec.Command("killall", "ios-deploy").Run() // cleanup
|
|
|
|
exec.Command("killall", "ios-deploy").Run()
|
2015-03-01 11:47:54 -07:00
|
|
|
|
2015-03-06 07:45:24 -07:00
|
|
|
var opts options
|
|
|
|
opts, args = parseArgs(args)
|
|
|
|
|
2015-03-01 11:47:54 -07:00
|
|
|
// ios-deploy invokes lldb to give us a shell session with the app.
|
2015-11-04 09:21:55 -07:00
|
|
|
s, err := newSession(appdir, args, opts)
|
|
|
|
if err != nil {
|
|
|
|
return err
|
|
|
|
}
|
|
|
|
defer func() {
|
|
|
|
b := s.out.Bytes()
|
|
|
|
if err == nil && !debug {
|
|
|
|
i := bytes.Index(b, []byte("(lldb) process continue"))
|
|
|
|
if i > 0 {
|
|
|
|
b = b[i:]
|
|
|
|
}
|
|
|
|
}
|
|
|
|
os.Stdout.Write(b)
|
|
|
|
}()
|
|
|
|
|
|
|
|
// Script LLDB. Oh dear.
|
|
|
|
s.do(`process handle SIGHUP --stop false --pass true --notify false`)
|
|
|
|
s.do(`process handle SIGPIPE --stop false --pass true --notify false`)
|
|
|
|
s.do(`process handle SIGUSR1 --stop false --pass true --notify false`)
|
2016-03-24 03:40:34 -06:00
|
|
|
s.do(`process handle SIGCONT --stop false --pass true --notify false`)
|
2015-11-04 09:21:55 -07:00
|
|
|
s.do(`process handle SIGSEGV --stop false --pass true --notify false`) // does not work
|
|
|
|
s.do(`process handle SIGBUS --stop false --pass true --notify false`) // does not work
|
|
|
|
|
|
|
|
if opts.lldb {
|
|
|
|
_, err := io.Copy(s.in, os.Stdin)
|
|
|
|
if err != io.EOF {
|
|
|
|
return err
|
|
|
|
}
|
|
|
|
return nil
|
|
|
|
}
|
|
|
|
|
2016-03-23 09:17:44 -06:00
|
|
|
started = true
|
|
|
|
|
misc/ios,cmd/go, runtime/cgo: fix iOS test harness (again)
The iOS test harness was recently changed in response to lldb bugs
to replace breakpoints with the SIGUSR2 signal (CL 34926), and to
pass the current directory in the test binary arguments (CL 35152).
Both the signal sending and working directory setup is done from
the go test driver.
However, the new method doesn't work with tests where a C program is
the test driver instead of go test: the current working directory
will not be changed and SIGUSR2 is not raised.
Instead of copying that logic into any C test program, rework the
test harness (again) to move the setup logic to the early runtime
cgo setup code. That way, the harness will run even in the library
build modes.
Then, use the app Info.plist file to pass the working
directory, removing the need to alter the arguments after running.
Finally, use the SIGINT signal instead of SIGUSR2 to avoid
manipulating the signal masks or handlers.
Fixes the testcarchive tests on iOS.
With this CL, both darwin/arm and darwin/arm64 passes all.bash.
This CL replaces CL 34926, CL 35152 as well as the fixup CL
35123 and CL 35255. They are reverted in CLs earlier in the
relation chain.
Change-Id: I8485c7db1404fbd8daa261efd1ea89e905121a3e
Reviewed-on: https://go-review.googlesource.com/36090
Run-TryBot: Elias Naur <elias.naur@gmail.com>
TryBot-Result: Gobot Gobot <gobot@golang.org>
Reviewed-by: David Crawshaw <crawshaw@golang.org>
2017-02-01 08:04:07 -07:00
|
|
|
s.doCmd("run", "stop reason = signal SIGINT", 20*time.Second)
|
2017-03-03 17:15:14 -07:00
|
|
|
|
2015-11-04 09:21:55 -07:00
|
|
|
startTestsLen := s.out.Len()
|
|
|
|
fmt.Fprintln(s.in, `process continue`)
|
|
|
|
|
|
|
|
passed := func(out *buf) bool {
|
|
|
|
// Just to make things fun, lldb sometimes translates \n into \r\n.
|
|
|
|
return s.out.LastIndex([]byte("\nPASS\n")) > startTestsLen ||
|
|
|
|
s.out.LastIndex([]byte("\nPASS\r")) > startTestsLen ||
|
|
|
|
s.out.LastIndex([]byte("\n(lldb) PASS\n")) > startTestsLen ||
|
2017-02-01 10:41:27 -07:00
|
|
|
s.out.LastIndex([]byte("\n(lldb) PASS\r")) > startTestsLen ||
|
|
|
|
s.out.LastIndex([]byte("exited with status = 0 (0x00000000) \n")) > startTestsLen ||
|
|
|
|
s.out.LastIndex([]byte("exited with status = 0 (0x00000000) \r")) > startTestsLen
|
2015-11-04 09:21:55 -07:00
|
|
|
}
|
|
|
|
err = s.wait("test completion", passed, opts.timeout)
|
|
|
|
if passed(s.out) {
|
|
|
|
// The returned lldb error code is usually non-zero.
|
|
|
|
// We check for test success by scanning for the final
|
|
|
|
// PASS returned by the test harness, assuming the worst
|
|
|
|
// in its absence.
|
|
|
|
return nil
|
|
|
|
}
|
|
|
|
return err
|
|
|
|
}
|
|
|
|
|
|
|
|
type lldbSession struct {
|
|
|
|
cmd *exec.Cmd
|
|
|
|
in *os.File
|
|
|
|
out *buf
|
|
|
|
timedout chan struct{}
|
|
|
|
exited chan error
|
|
|
|
}
|
|
|
|
|
|
|
|
func newSession(appdir string, args []string, opts options) (*lldbSession, error) {
|
|
|
|
lldbr, in, err := os.Pipe()
|
|
|
|
if err != nil {
|
|
|
|
return nil, err
|
|
|
|
}
|
|
|
|
s := &lldbSession{
|
|
|
|
in: in,
|
|
|
|
out: new(buf),
|
|
|
|
exited: make(chan error),
|
|
|
|
}
|
|
|
|
|
2016-03-23 09:17:44 -06:00
|
|
|
iosdPath, err := exec.LookPath("ios-deploy")
|
|
|
|
if err != nil {
|
|
|
|
return nil, err
|
|
|
|
}
|
2015-11-04 09:21:55 -07:00
|
|
|
s.cmd = exec.Command(
|
2015-03-01 11:47:54 -07:00
|
|
|
// lldb tries to be clever with terminals.
|
|
|
|
// So we wrap it in script(1) and be clever
|
|
|
|
// right back at it.
|
|
|
|
"script",
|
|
|
|
"-q", "-t", "0",
|
|
|
|
"/dev/null",
|
|
|
|
|
2016-03-23 09:17:44 -06:00
|
|
|
iosdPath,
|
2015-03-01 11:47:54 -07:00
|
|
|
"--debug",
|
|
|
|
"-u",
|
|
|
|
"-r",
|
|
|
|
"-n",
|
|
|
|
`--args=`+strings.Join(args, " ")+``,
|
|
|
|
"--bundle", appdir,
|
|
|
|
)
|
|
|
|
if debug {
|
2015-11-04 09:21:55 -07:00
|
|
|
log.Println(strings.Join(s.cmd.Args, " "))
|
2015-03-01 11:47:54 -07:00
|
|
|
}
|
|
|
|
|
2015-11-04 09:21:55 -07:00
|
|
|
var out io.Writer = s.out
|
2015-03-06 07:45:24 -07:00
|
|
|
if opts.lldb {
|
2015-11-04 09:21:55 -07:00
|
|
|
out = io.MultiWriter(out, os.Stderr)
|
2015-03-06 07:45:24 -07:00
|
|
|
}
|
2015-11-04 09:21:55 -07:00
|
|
|
s.cmd.Stdout = out
|
|
|
|
s.cmd.Stderr = out // everything of interest is on stderr
|
|
|
|
s.cmd.Stdin = lldbr
|
2015-03-01 11:47:54 -07:00
|
|
|
|
2015-11-04 09:21:55 -07:00
|
|
|
if err := s.cmd.Start(); err != nil {
|
|
|
|
return nil, fmt.Errorf("ios-deploy failed to start: %v", err)
|
2015-03-01 11:47:54 -07:00
|
|
|
}
|
|
|
|
|
|
|
|
// Manage the -test.timeout here, outside of the test. There is a lot
|
|
|
|
// of moving parts in an iOS test harness (notably lldb) that can
|
|
|
|
// swallow useful stdio or cause its own ruckus.
|
2015-03-06 07:45:24 -07:00
|
|
|
if opts.timeout > 1*time.Second {
|
2015-11-04 09:21:55 -07:00
|
|
|
s.timedout = make(chan struct{})
|
2015-03-06 07:45:24 -07:00
|
|
|
time.AfterFunc(opts.timeout-1*time.Second, func() {
|
2015-11-04 09:21:55 -07:00
|
|
|
close(s.timedout)
|
2015-03-01 11:47:54 -07:00
|
|
|
})
|
|
|
|
}
|
|
|
|
|
|
|
|
go func() {
|
2015-11-04 09:21:55 -07:00
|
|
|
s.exited <- s.cmd.Wait()
|
2015-03-01 11:47:54 -07:00
|
|
|
}()
|
|
|
|
|
2015-11-04 09:21:55 -07:00
|
|
|
cond := func(out *buf) bool {
|
|
|
|
i0 := s.out.LastIndex([]byte("(lldb)"))
|
|
|
|
i1 := s.out.LastIndex([]byte("fruitstrap"))
|
|
|
|
i2 := s.out.LastIndex([]byte(" connect"))
|
|
|
|
return i0 > 0 && i1 > 0 && i2 > 0
|
2015-03-01 11:47:54 -07:00
|
|
|
}
|
2017-04-27 03:37:24 -06:00
|
|
|
if err := s.wait("lldb start", cond, 15*time.Second); err != nil {
|
2016-03-23 09:17:44 -06:00
|
|
|
panic(waitPanic{err})
|
2015-03-01 11:47:54 -07:00
|
|
|
}
|
2015-11-04 09:21:55 -07:00
|
|
|
return s, nil
|
|
|
|
}
|
2015-03-01 11:47:54 -07:00
|
|
|
|
2015-11-04 09:21:55 -07:00
|
|
|
func (s *lldbSession) do(cmd string) { s.doCmd(cmd, "(lldb)", 0) }
|
2015-03-01 11:47:54 -07:00
|
|
|
|
2015-11-04 09:21:55 -07:00
|
|
|
func (s *lldbSession) doCmd(cmd string, waitFor string, extraTimeout time.Duration) {
|
|
|
|
startLen := s.out.Len()
|
|
|
|
fmt.Fprintln(s.in, cmd)
|
|
|
|
cond := func(out *buf) bool {
|
|
|
|
i := s.out.LastIndex([]byte(waitFor))
|
|
|
|
return i > startLen
|
2015-03-06 07:45:24 -07:00
|
|
|
}
|
2015-11-04 09:21:55 -07:00
|
|
|
if err := s.wait(fmt.Sprintf("running cmd %q", cmd), cond, extraTimeout); err != nil {
|
|
|
|
panic(waitPanic{err})
|
2015-03-01 11:47:54 -07:00
|
|
|
}
|
2015-11-04 09:21:55 -07:00
|
|
|
}
|
2015-03-01 11:47:54 -07:00
|
|
|
|
2015-11-04 09:21:55 -07:00
|
|
|
func (s *lldbSession) wait(reason string, cond func(out *buf) bool, extraTimeout time.Duration) error {
|
2016-03-23 09:17:44 -06:00
|
|
|
doTimeout := 2*time.Second + extraTimeout
|
2015-11-04 09:21:55 -07:00
|
|
|
doTimedout := time.After(doTimeout)
|
|
|
|
for {
|
|
|
|
select {
|
|
|
|
case <-s.timedout:
|
|
|
|
if p := s.cmd.Process; p != nil {
|
|
|
|
p.Kill()
|
|
|
|
}
|
|
|
|
return fmt.Errorf("test timeout (%s)", reason)
|
|
|
|
case <-doTimedout:
|
|
|
|
return fmt.Errorf("command timeout (%s for %v)", reason, doTimeout)
|
|
|
|
case err := <-s.exited:
|
|
|
|
return fmt.Errorf("exited (%s: %v)", reason, err)
|
|
|
|
default:
|
|
|
|
if cond(s.out) {
|
|
|
|
return nil
|
|
|
|
}
|
|
|
|
time.Sleep(20 * time.Millisecond)
|
2015-03-01 11:47:54 -07:00
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2015-11-04 09:21:55 -07:00
|
|
|
type buf struct {
|
|
|
|
mu sync.Mutex
|
|
|
|
buf []byte
|
2015-03-01 11:47:54 -07:00
|
|
|
}
|
|
|
|
|
2015-11-04 09:21:55 -07:00
|
|
|
func (w *buf) Write(in []byte) (n int, err error) {
|
2015-03-01 11:47:54 -07:00
|
|
|
w.mu.Lock()
|
|
|
|
defer w.mu.Unlock()
|
|
|
|
w.buf = append(w.buf, in...)
|
2015-11-04 09:21:55 -07:00
|
|
|
return len(in), nil
|
2015-03-01 11:47:54 -07:00
|
|
|
}
|
|
|
|
|
2015-11-04 09:21:55 -07:00
|
|
|
func (w *buf) LastIndex(sep []byte) int {
|
2015-03-01 11:47:54 -07:00
|
|
|
w.mu.Lock()
|
|
|
|
defer w.mu.Unlock()
|
2015-11-04 09:21:55 -07:00
|
|
|
return bytes.LastIndex(w.buf, sep)
|
2015-03-01 11:47:54 -07:00
|
|
|
}
|
|
|
|
|
2015-11-04 09:21:55 -07:00
|
|
|
func (w *buf) Bytes() []byte {
|
2015-03-01 11:47:54 -07:00
|
|
|
w.mu.Lock()
|
|
|
|
defer w.mu.Unlock()
|
|
|
|
|
2015-11-04 09:21:55 -07:00
|
|
|
b := make([]byte, len(w.buf))
|
|
|
|
copy(b, w.buf)
|
|
|
|
return b
|
2015-03-01 11:47:54 -07:00
|
|
|
}
|
|
|
|
|
2015-11-04 09:21:55 -07:00
|
|
|
func (w *buf) Len() int {
|
2015-03-01 11:47:54 -07:00
|
|
|
w.mu.Lock()
|
|
|
|
defer w.mu.Unlock()
|
2015-11-04 09:21:55 -07:00
|
|
|
return len(w.buf)
|
2015-03-01 11:47:54 -07:00
|
|
|
}
|
|
|
|
|
2015-11-04 09:21:55 -07:00
|
|
|
type waitPanic struct {
|
|
|
|
err error
|
2015-03-01 11:47:54 -07:00
|
|
|
}
|
|
|
|
|
2015-03-06 07:45:24 -07:00
|
|
|
type options struct {
|
|
|
|
timeout time.Duration
|
|
|
|
lldb bool
|
|
|
|
}
|
|
|
|
|
|
|
|
func parseArgs(binArgs []string) (opts options, remainingArgs []string) {
|
|
|
|
var flagArgs []string
|
|
|
|
for _, arg := range binArgs {
|
|
|
|
if strings.Contains(arg, "-test.timeout") {
|
|
|
|
flagArgs = append(flagArgs, arg)
|
|
|
|
}
|
|
|
|
if strings.Contains(arg, "-lldb") {
|
|
|
|
flagArgs = append(flagArgs, arg)
|
|
|
|
continue
|
2015-03-01 11:47:54 -07:00
|
|
|
}
|
2015-03-06 07:45:24 -07:00
|
|
|
remainingArgs = append(remainingArgs, arg)
|
2015-03-01 11:47:54 -07:00
|
|
|
}
|
|
|
|
f := flag.NewFlagSet("", flag.ContinueOnError)
|
2017-02-01 04:28:47 -07:00
|
|
|
f.DurationVar(&opts.timeout, "test.timeout", 10*time.Minute, "")
|
2015-03-06 07:45:24 -07:00
|
|
|
f.BoolVar(&opts.lldb, "lldb", false, "")
|
|
|
|
f.Parse(flagArgs)
|
|
|
|
return opts, remainingArgs
|
|
|
|
|
2015-03-01 11:47:54 -07:00
|
|
|
}
|
|
|
|
|
|
|
|
func copyLocalDir(dst, src string) error {
|
|
|
|
if err := os.Mkdir(dst, 0755); err != nil {
|
|
|
|
return err
|
|
|
|
}
|
|
|
|
|
|
|
|
d, err := os.Open(src)
|
|
|
|
if err != nil {
|
|
|
|
return err
|
|
|
|
}
|
|
|
|
defer d.Close()
|
|
|
|
fi, err := d.Readdir(-1)
|
|
|
|
if err != nil {
|
|
|
|
return err
|
|
|
|
}
|
|
|
|
|
|
|
|
for _, f := range fi {
|
|
|
|
if f.IsDir() {
|
|
|
|
if f.Name() == "testdata" {
|
|
|
|
if err := cp(dst, filepath.Join(src, f.Name())); err != nil {
|
|
|
|
return err
|
|
|
|
}
|
|
|
|
}
|
|
|
|
continue
|
|
|
|
}
|
|
|
|
if err := cp(dst, filepath.Join(src, f.Name())); err != nil {
|
|
|
|
return err
|
|
|
|
}
|
|
|
|
}
|
|
|
|
return nil
|
|
|
|
}
|
|
|
|
|
|
|
|
func cp(dst, src string) error {
|
|
|
|
out, err := exec.Command("cp", "-a", src, dst).CombinedOutput()
|
|
|
|
if err != nil {
|
|
|
|
os.Stderr.Write(out)
|
|
|
|
}
|
|
|
|
return err
|
|
|
|
}
|
|
|
|
|
|
|
|
func copyLocalData(dstbase string) (pkgpath string, err error) {
|
|
|
|
cwd, err := os.Getwd()
|
|
|
|
if err != nil {
|
|
|
|
return "", err
|
|
|
|
}
|
|
|
|
|
|
|
|
finalPkgpath, underGoRoot, err := subdir()
|
|
|
|
if err != nil {
|
|
|
|
return "", err
|
|
|
|
}
|
|
|
|
cwd = strings.TrimSuffix(cwd, finalPkgpath)
|
|
|
|
|
|
|
|
// Copy all immediate files and testdata directories between
|
|
|
|
// the package being tested and the source root.
|
|
|
|
pkgpath = ""
|
|
|
|
for _, element := range strings.Split(finalPkgpath, string(filepath.Separator)) {
|
|
|
|
if debug {
|
|
|
|
log.Printf("copying %s", pkgpath)
|
|
|
|
}
|
|
|
|
pkgpath = filepath.Join(pkgpath, element)
|
|
|
|
dst := filepath.Join(dstbase, pkgpath)
|
|
|
|
src := filepath.Join(cwd, pkgpath)
|
|
|
|
if err := copyLocalDir(dst, src); err != nil {
|
|
|
|
return "", err
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
if underGoRoot {
|
2017-04-17 13:09:56 -06:00
|
|
|
// Copy timezone file.
|
|
|
|
//
|
|
|
|
// Typical apps have the zoneinfo.zip in the root of their app bundle,
|
|
|
|
// read by the time package as the working directory at initialization.
|
|
|
|
// As we move the working directory to the GOROOT pkg directory, we
|
|
|
|
// install the zoneinfo.zip file in the pkgpath.
|
2015-03-02 14:05:11 -07:00
|
|
|
err := cp(
|
2017-02-01 11:54:03 -07:00
|
|
|
filepath.Join(dstbase, pkgpath),
|
2015-03-02 14:05:11 -07:00
|
|
|
filepath.Join(cwd, "lib", "time", "zoneinfo.zip"),
|
|
|
|
)
|
|
|
|
if err != nil {
|
2015-03-01 11:47:54 -07:00
|
|
|
return "", err
|
|
|
|
}
|
2017-04-17 13:09:56 -06:00
|
|
|
// Copy src/runtime/textflag.h for (at least) Test386EndToEnd in
|
|
|
|
// cmd/asm/internal/asm.
|
|
|
|
runtimePath := filepath.Join(dstbase, "src", "runtime")
|
|
|
|
if err := os.MkdirAll(runtimePath, 0755); err != nil {
|
|
|
|
return "", err
|
|
|
|
}
|
|
|
|
err = cp(
|
|
|
|
filepath.Join(runtimePath, "textflag.h"),
|
|
|
|
filepath.Join(cwd, "src", "runtime", "textflag.h"),
|
|
|
|
)
|
|
|
|
if err != nil {
|
|
|
|
return "", err
|
|
|
|
}
|
2015-03-01 11:47:54 -07:00
|
|
|
}
|
|
|
|
|
|
|
|
return finalPkgpath, nil
|
|
|
|
}
|
|
|
|
|
|
|
|
// subdir determines the package based on the current working directory,
|
|
|
|
// and returns the path to the package source relative to $GOROOT (or $GOPATH).
|
|
|
|
func subdir() (pkgpath string, underGoRoot bool, err error) {
|
|
|
|
cwd, err := os.Getwd()
|
|
|
|
if err != nil {
|
|
|
|
return "", false, err
|
|
|
|
}
|
|
|
|
if root := runtime.GOROOT(); strings.HasPrefix(cwd, root) {
|
|
|
|
subdir, err := filepath.Rel(root, cwd)
|
|
|
|
if err != nil {
|
|
|
|
return "", false, err
|
|
|
|
}
|
|
|
|
return subdir, true, nil
|
|
|
|
}
|
|
|
|
|
|
|
|
for _, p := range filepath.SplitList(build.Default.GOPATH) {
|
|
|
|
if !strings.HasPrefix(cwd, p) {
|
|
|
|
continue
|
|
|
|
}
|
|
|
|
subdir, err := filepath.Rel(p, cwd)
|
|
|
|
if err == nil {
|
|
|
|
return subdir, false, nil
|
|
|
|
}
|
|
|
|
}
|
|
|
|
return "", false, fmt.Errorf(
|
|
|
|
"working directory %q is not in either GOROOT(%q) or GOPATH(%q)",
|
|
|
|
cwd,
|
|
|
|
runtime.GOROOT(),
|
|
|
|
build.Default.GOPATH,
|
|
|
|
)
|
|
|
|
}
|
|
|
|
|
misc/ios,cmd/go, runtime/cgo: fix iOS test harness (again)
The iOS test harness was recently changed in response to lldb bugs
to replace breakpoints with the SIGUSR2 signal (CL 34926), and to
pass the current directory in the test binary arguments (CL 35152).
Both the signal sending and working directory setup is done from
the go test driver.
However, the new method doesn't work with tests where a C program is
the test driver instead of go test: the current working directory
will not be changed and SIGUSR2 is not raised.
Instead of copying that logic into any C test program, rework the
test harness (again) to move the setup logic to the early runtime
cgo setup code. That way, the harness will run even in the library
build modes.
Then, use the app Info.plist file to pass the working
directory, removing the need to alter the arguments after running.
Finally, use the SIGINT signal instead of SIGUSR2 to avoid
manipulating the signal masks or handlers.
Fixes the testcarchive tests on iOS.
With this CL, both darwin/arm and darwin/arm64 passes all.bash.
This CL replaces CL 34926, CL 35152 as well as the fixup CL
35123 and CL 35255. They are reverted in CLs earlier in the
relation chain.
Change-Id: I8485c7db1404fbd8daa261efd1ea89e905121a3e
Reviewed-on: https://go-review.googlesource.com/36090
Run-TryBot: Elias Naur <elias.naur@gmail.com>
TryBot-Result: Gobot Gobot <gobot@golang.org>
Reviewed-by: David Crawshaw <crawshaw@golang.org>
2017-02-01 08:04:07 -07:00
|
|
|
func infoPlist(pkgpath string) string {
|
2017-02-01 01:37:47 -07:00
|
|
|
return `<?xml version="1.0" encoding="UTF-8"?>
|
2015-03-01 11:47:54 -07:00
|
|
|
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
|
|
|
|
<plist version="1.0">
|
|
|
|
<dict>
|
|
|
|
<key>CFBundleName</key><string>golang.gotest</string>
|
|
|
|
<key>CFBundleSupportedPlatforms</key><array><string>iPhoneOS</string></array>
|
|
|
|
<key>CFBundleExecutable</key><string>gotest</string>
|
|
|
|
<key>CFBundleVersion</key><string>1.0</string>
|
2017-02-01 01:37:47 -07:00
|
|
|
<key>CFBundleIdentifier</key><string>` + bundleID + `</string>
|
2015-03-01 11:47:54 -07:00
|
|
|
<key>CFBundleResourceSpecification</key><string>ResourceRules.plist</string>
|
|
|
|
<key>LSRequiresIPhoneOS</key><true/>
|
|
|
|
<key>CFBundleDisplayName</key><string>gotest</string>
|
misc/ios,cmd/go, runtime/cgo: fix iOS test harness (again)
The iOS test harness was recently changed in response to lldb bugs
to replace breakpoints with the SIGUSR2 signal (CL 34926), and to
pass the current directory in the test binary arguments (CL 35152).
Both the signal sending and working directory setup is done from
the go test driver.
However, the new method doesn't work with tests where a C program is
the test driver instead of go test: the current working directory
will not be changed and SIGUSR2 is not raised.
Instead of copying that logic into any C test program, rework the
test harness (again) to move the setup logic to the early runtime
cgo setup code. That way, the harness will run even in the library
build modes.
Then, use the app Info.plist file to pass the working
directory, removing the need to alter the arguments after running.
Finally, use the SIGINT signal instead of SIGUSR2 to avoid
manipulating the signal masks or handlers.
Fixes the testcarchive tests on iOS.
With this CL, both darwin/arm and darwin/arm64 passes all.bash.
This CL replaces CL 34926, CL 35152 as well as the fixup CL
35123 and CL 35255. They are reverted in CLs earlier in the
relation chain.
Change-Id: I8485c7db1404fbd8daa261efd1ea89e905121a3e
Reviewed-on: https://go-review.googlesource.com/36090
Run-TryBot: Elias Naur <elias.naur@gmail.com>
TryBot-Result: Gobot Gobot <gobot@golang.org>
Reviewed-by: David Crawshaw <crawshaw@golang.org>
2017-02-01 08:04:07 -07:00
|
|
|
<key>GoExecWrapperWorkingDirectory</key><string>` + pkgpath + `</string>
|
2015-03-01 11:47:54 -07:00
|
|
|
</dict>
|
|
|
|
</plist>
|
|
|
|
`
|
2017-02-01 01:37:47 -07:00
|
|
|
}
|
2015-03-01 11:47:54 -07:00
|
|
|
|
2015-04-13 12:31:41 -06:00
|
|
|
func entitlementsPlist() string {
|
|
|
|
return `<?xml version="1.0" encoding="UTF-8"?>
|
2015-03-01 11:47:54 -07:00
|
|
|
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
|
|
|
|
<plist version="1.0">
|
|
|
|
<dict>
|
|
|
|
<key>keychain-access-groups</key>
|
2017-02-01 01:37:47 -07:00
|
|
|
<array><string>` + appID + `</string></array>
|
2015-03-01 11:47:54 -07:00
|
|
|
<key>get-task-allow</key>
|
|
|
|
<true/>
|
|
|
|
<key>application-identifier</key>
|
2017-02-01 01:37:47 -07:00
|
|
|
<string>` + appID + `</string>
|
2015-03-01 11:47:54 -07:00
|
|
|
<key>com.apple.developer.team-identifier</key>
|
2015-04-13 12:31:41 -06:00
|
|
|
<string>` + teamID + `</string>
|
2015-03-01 11:47:54 -07:00
|
|
|
</dict>
|
2015-05-03 01:13:46 -06:00
|
|
|
</plist>
|
|
|
|
`
|
2015-04-13 12:31:41 -06:00
|
|
|
}
|
2015-03-01 11:47:54 -07:00
|
|
|
|
|
|
|
const resourceRules = `<?xml version="1.0" encoding="UTF-8"?>
|
|
|
|
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
|
|
|
|
<plist version="1.0">
|
|
|
|
<dict>
|
2015-05-03 01:13:46 -06:00
|
|
|
<key>rules</key>
|
|
|
|
<dict>
|
|
|
|
<key>.*</key>
|
|
|
|
<true/>
|
|
|
|
<key>Info.plist</key>
|
2015-03-01 11:47:54 -07:00
|
|
|
<dict>
|
2015-05-03 01:13:46 -06:00
|
|
|
<key>omit</key>
|
|
|
|
<true/>
|
|
|
|
<key>weight</key>
|
|
|
|
<integer>10</integer>
|
2015-03-01 11:47:54 -07:00
|
|
|
</dict>
|
|
|
|
<key>ResourceRules.plist</key>
|
|
|
|
<dict>
|
2015-05-03 01:13:46 -06:00
|
|
|
<key>omit</key>
|
|
|
|
<true/>
|
|
|
|
<key>weight</key>
|
|
|
|
<integer>100</integer>
|
2015-03-01 11:47:54 -07:00
|
|
|
</dict>
|
|
|
|
</dict>
|
|
|
|
</dict>
|
|
|
|
</plist>
|
|
|
|
`
|