new

Change-Id: Id2efa3dc9cc5189fdd70e6851eff59d5f94e3419

Author: qiulaidongfeng

src/runtime/proc_test.go

@@ -1164,7 +1164,7 @@ func TestCgoToGoCallGoexit(t *testing.T) {
 		t.Skipf("no pthreads on %s", runtime.GOOS)
 	}
 	output := runTestProg(t, "testprogcgo", "CgoToGoCallGoexit")
-	if output != "OK\n" {
-		t.Fatalf("want OK\n, got %s", output)
+	if !strings.Contains(output, "runtime.Goexit called in a thread that was not created by the Go runtime") {
+		t.Fatalf("output should contain %s", "runtime.Goexit called in a thread that was not created by the Go runtime")
 	}
 }

src/runtime/testdata/testprogcgo/callback.go

@@ -42,12 +42,6 @@ func init() {
 }
 
 func CgoToGoCallGoexit() {
-	defer func() {
-		if err := recover(); err != "runtime.Goexit called in a thread that was not created by the Go runtime" {
-			panic("expect: runtime.Goexit called in a thread that was not created by the Go runtime")
-		}
-		fmt.Println("OK")
-	}()
 	goexit = true
 	C.foo()
 }