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>

diff --git a/misc/ios/go_darwin_arm_exec.go b/misc/ios/go_darwin_arm_exec.go
index 4406c9aa4fbd2a34d51125fe815c36e458cd202e..46e3fcbc43caad877fe656932d6fc64ab00cba43 100644 (file)
--- a/misc/ios/go_darwin_arm_exec.go
+++ b/misc/ios/go_darwin_arm_exec.go
@@ -147,22 +147,22 @@ func run(bin string, args []string) (err error) {
                return err
        }
 
+       pkgpath, err := copyLocalData(appdir)
+       if err != nil {
+               return err
+       }
+
        entitlementsPath := filepath.Join(tmpdir, "Entitlements.plist")
        if err := ioutil.WriteFile(entitlementsPath, []byte(entitlementsPlist()), 0744); err != nil {
                return err
        }
-       if err := ioutil.WriteFile(filepath.Join(appdir, "Info.plist"), []byte(infoPlist()), 0744); err != nil {
+       if err := ioutil.WriteFile(filepath.Join(appdir, "Info.plist"), []byte(infoPlist(pkgpath)), 0744); err != nil {
                return err
        }
        if err := ioutil.WriteFile(filepath.Join(appdir, "ResourceRules.plist"), []byte(resourceRules), 0744); err != nil {
                return err
        }
 
-       pkgpath, err := copyLocalData(appdir)
-       if err != nil {
-               return err
-       }
-
        cmd := exec.Command(
                "codesign",
                "-f",
@@ -244,20 +244,9 @@ func run(bin string, args []string) (err error) {
                return nil
        }
 
-       s.do(`breakpoint set -n getwd`) // in runtime/cgo/gcc_darwin_arm.go
-
        started = true
 
-       s.doCmd("run", "stop reason = breakpoint", 20*time.Second)
-
-       // Move the current working directory into the faux gopath.
-       if pkgpath != "src" {
-               s.do(`breakpoint delete 1`)
-               s.do(`expr char* $mem = (char*)malloc(512)`)
-               s.do(`expr $mem = (char*)getwd($mem, 512)`)
-               s.do(`expr $mem = (char*)strcat($mem, "/` + pkgpath + `")`)
-               s.do(`call (void)chdir($mem)`)
-       }
+       s.doCmd("run", "stop reason = signal SIGINT", 20*time.Second)
 
        startTestsLen := s.out.Len()
        fmt.Fprintln(s.in, `process continue`)
@@ -579,7 +568,7 @@ func subdir() (pkgpath string, underGoRoot bool, err error) {
        )
 }
 
-func infoPlist() string {
+func infoPlist(pkgpath string) string {
        return `<?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">
@@ -592,6 +581,7 @@ func infoPlist() string {
 <key>CFBundleResourceSpecification</key><string>ResourceRules.plist</string>
 <key>LSRequiresIPhoneOS</key><true/>
 <key>CFBundleDisplayName</key><string>gotest</string>
+<key>GoExecWrapperWorkingDirectory</key><string>` + pkgpath + `</string>
 </dict>
 </plist>
 `

diff --git a/src/runtime/cgo/gcc_darwin_arm.c b/src/runtime/cgo/gcc_darwin_arm.c
index b3f80460111e0ece2644a1c91a0399dbd0a4d49b..3e1574f66d7be064bf5e3f4af70d555a898ed6a5 100644 (file)
--- a/src/runtime/cgo/gcc_darwin_arm.c
+++ b/src/runtime/cgo/gcc_darwin_arm.c
@@ -107,30 +107,40 @@ init_working_dir()
                return;
        }
        CFStringRef url_str_ref = CFURLGetString(url_ref);
-       char url[MAXPATHLEN];
-        if (!CFStringGetCString(url_str_ref, url, sizeof(url), kCFStringEncodingUTF8)) {
+       char buf[MAXPATHLEN];
+       if (!CFStringGetCString(url_str_ref, buf, sizeof(buf), kCFStringEncodingUTF8)) {
                fprintf(stderr, "runtime/cgo: cannot get URL string\n");
                return;
        }
 
        // url is of the form "file:///path/to/Info.plist".
        // strip it down to the working directory "/path/to".
-       int url_len = strlen(url);
+       int url_len = strlen(buf);
        if (url_len < sizeof("file://")+sizeof("/Info.plist")) {
-               fprintf(stderr, "runtime/cgo: bad URL: %s\n", url);
+               fprintf(stderr, "runtime/cgo: bad URL: %s\n", buf);
                return;
        }
-       url[url_len-sizeof("/Info.plist")+1] = 0;
-       char *dir = &url[0] + sizeof("file://")-1;
+       buf[url_len-sizeof("/Info.plist")+1] = 0;
+       char *dir = &buf[0] + sizeof("file://")-1;
 
        if (chdir(dir) != 0) {
                fprintf(stderr, "runtime/cgo: chdir(%s) failed\n", dir);
        }
 
-       // No-op to set a breakpoint on, immediately after the real chdir.
-       // Gives the test harness in go_darwin_arm_exec (which uses lldb) a
-       // chance to move the working directory.
-       getwd(dir);
+       // The test harness in go_darwin_arm_exec passes the relative working directory
+       // in the GoExecWrapperWorkingDirectory property of the app bundle.
+       CFStringRef wd_ref = CFBundleGetValueForInfoDictionaryKey(bundle, CFSTR("GoExecWrapperWorkingDirectory"));
+       if (wd_ref != NULL) {
+               if (!CFStringGetCString(wd_ref, buf, sizeof(buf), kCFStringEncodingUTF8)) {
+                       fprintf(stderr, "runtime/cgo: cannot get GoExecWrapperWorkingDirectory string\n");
+                       return;
+               }
+               if (chdir(buf) != 0) {
+                       fprintf(stderr, "runtime/cgo: chdir(%s) failed\n", buf);
+               }
+               // Notify the test harness that we're correctly set up
+               raise(SIGINT);
+       }
 }
 
 void

diff --git a/src/runtime/cgo/gcc_darwin_arm64.c b/src/runtime/cgo/gcc_darwin_arm64.c
index 039dcc02bd628f21daec3cc8e0a4a201c984fcc0..05b0121d0f502fe5021ab3ac396d8b2d625c27b6 100644 (file)
--- a/src/runtime/cgo/gcc_darwin_arm64.c
+++ b/src/runtime/cgo/gcc_darwin_arm64.c
@@ -109,30 +109,40 @@ init_working_dir()
                return;
        }
        CFStringRef url_str_ref = CFURLGetString(url_ref);
-       char url[MAXPATHLEN];
-        if (!CFStringGetCString(url_str_ref, url, sizeof(url), kCFStringEncodingUTF8)) {
+       char buf[MAXPATHLEN];
+       if (!CFStringGetCString(url_str_ref, buf, sizeof(buf), kCFStringEncodingUTF8)) {
                fprintf(stderr, "runtime/cgo: cannot get URL string\n");
                return;
        }
 
        // url is of the form "file:///path/to/Info.plist".
        // strip it down to the working directory "/path/to".
-       int url_len = strlen(url);
+       int url_len = strlen(buf);
        if (url_len < sizeof("file://")+sizeof("/Info.plist")) {
-               fprintf(stderr, "runtime/cgo: bad URL: %s\n", url);
+               fprintf(stderr, "runtime/cgo: bad URL: %s\n", buf);
                return;
        }
-       url[url_len-sizeof("/Info.plist")+1] = 0;
-       char *dir = &url[0] + sizeof("file://")-1;
+       buf[url_len-sizeof("/Info.plist")+1] = 0;
+       char *dir = &buf[0] + sizeof("file://")-1;
 
        if (chdir(dir) != 0) {
                fprintf(stderr, "runtime/cgo: chdir(%s) failed\n", dir);
        }
 
-       // No-op to set a breakpoint on, immediately after the real chdir.
-       // Gives the test harness in go_darwin_arm_exec (which uses lldb) a
-       // chance to move the working directory.
-       getwd(dir);
+       // The test harness in go_darwin_arm_exec passes the relative working directory
+       // in the GoExecWrapperWorkingDirectory property of the app bundle.
+       CFStringRef wd_ref = CFBundleGetValueForInfoDictionaryKey(bundle, CFSTR("GoExecWrapperWorkingDirectory"));
+       if (wd_ref != NULL) {
+               if (!CFStringGetCString(wd_ref, buf, sizeof(buf), kCFStringEncodingUTF8)) {
+                       fprintf(stderr, "runtime/cgo: cannot get GoExecWrapperWorkingDirectory string\n");
+                       return;
+               }
+               if (chdir(buf) != 0) {
+                       fprintf(stderr, "runtime/cgo: chdir(%s) failed\n", buf);
+               }
+               // Notify the test harness that we're correctly set up
+               raise(SIGINT);
+       }
 }
 
 void