]> Cypherpunks.ru repositories - gostls13.git/commitdiff
misc/ios: allow exit code 0 to mean test success
authorElias Naur <elias.naur@gmail.com>
Wed, 1 Feb 2017 17:41:27 +0000 (18:41 +0100)
committerElias Naur <elias.naur@gmail.com>
Thu, 2 Feb 2017 08:15:32 +0000 (08:15 +0000)
Tests that use TestMain might never call m.Run(), and simply return
from TestMain. In that case, the iOS test harness never sees the
PASS from the testing framework and assumes the test failed.

Allow an exit with exit code 0 to also mean test success, thereby
fixing the objdump test on iOS.

Change-Id: I1fe9077b05931aa0905e41b88945cd153c5b35b6
Reviewed-on: https://go-review.googlesource.com/36065
Reviewed-by: David Crawshaw <crawshaw@golang.org>
Run-TryBot: Elias Naur <elias.naur@gmail.com>
TryBot-Result: Gobot Gobot <gobot@golang.org>

misc/ios/go_darwin_arm_exec.go

index bbc17f06ff9b8d80a1fc3bbf0c5e70c7de2989a6..493820315fee16a432d7a7d7ef535189edbc5d29 100644 (file)
@@ -262,7 +262,9 @@ func run(bin string, args []string) (err error) {
                return s.out.LastIndex([]byte("\nPASS\n")) > startTestsLen ||
                        s.out.LastIndex([]byte("\nPASS\r")) > startTestsLen ||
                        s.out.LastIndex([]byte("\n(lldb) PASS\n")) > startTestsLen ||
-                       s.out.LastIndex([]byte("\n(lldb) PASS\r")) > startTestsLen
+                       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
        }
        err = s.wait("test completion", passed, opts.timeout)
        if passed(s.out) {