mirror of https://github.com/golang/go.git
misc/cgo/testcarchive: enable test on darwin/arm
Change-Id: I0d3f9841500e0a41f1c427244869bf3736a31e18 Reviewed-on: https://go-review.googlesource.com/9075 Reviewed-by: Hyang-Ah Hana Kim <hyangah@gmail.com>
This commit is contained in:
parent
983a490ee9
commit
98f610fe09
|
|
@ -31,5 +31,6 @@ int main(void) {
|
|||
|
||||
CheckArgs();
|
||||
|
||||
fprintf(stderr, "PASS\n");
|
||||
return 0;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -7,7 +7,6 @@ package main
|
|||
import (
|
||||
"fmt"
|
||||
"os"
|
||||
"reflect"
|
||||
"syscall"
|
||||
"time"
|
||||
|
||||
|
|
@ -47,9 +46,8 @@ func DidMainRun() bool { return ranMain }
|
|||
|
||||
//export CheckArgs
|
||||
func CheckArgs() {
|
||||
want := []string{"./testp", "arg1", "arg2"}
|
||||
if !reflect.DeepEqual(want, os.Args) {
|
||||
fmt.Printf("CheckArgs: want %v, got: %v\n", want, os.Args)
|
||||
if len(os.Args) != 3 || os.Args[1] != "arg1" || os.Args[2] != "arg2" {
|
||||
fmt.Printf("CheckArgs: want [_, arg1, arg2], got: %v\n", os.Args)
|
||||
os.Exit(2)
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -10,7 +10,7 @@ if [ "$(go env GOOS)" == "darwin" ]; then
|
|||
ccargs="-Wl,-no_pie"
|
||||
# For darwin/arm.
|
||||
# TODO(crawshaw): Can we do better?
|
||||
ccargs="$ccargs -framework CoreFoundation"
|
||||
ccargs="$ccargs -framework CoreFoundation -framework Foundation"
|
||||
fi
|
||||
|
||||
# TODO(crawshaw): Consider a go env for exec script name.
|
||||
|
|
|
|||
|
|
@ -352,6 +352,7 @@ func (t *tester) extLink() bool {
|
|||
pair := t.gohostos + "-" + t.goarch
|
||||
switch pair {
|
||||
case "android-arm",
|
||||
"darwin-arm", "darwin-arm64",
|
||||
"dragonfly-386", "dragonfly-amd64",
|
||||
"freebsd-386", "freebsd-amd64", "freebsd-arm",
|
||||
"linux-386", "linux-amd64", "linux-arm",
|
||||
|
|
@ -378,9 +379,14 @@ func (t *tester) buildmode(mode string) bool {
|
|||
switch {
|
||||
case !t.extLink():
|
||||
return false
|
||||
case t.goos == "darwin" && t.goarch == "amd64":
|
||||
// TODO(crawshaw): add darwin/arm{,64}
|
||||
return true
|
||||
case t.goos == "darwin":
|
||||
switch t.goarch {
|
||||
case "amd64", "arm":
|
||||
// TODO(crawshaw): add darwin/arm64
|
||||
return true
|
||||
default:
|
||||
return false
|
||||
}
|
||||
case t.goos == "linux" && (t.goarch == "amd64" || t.goarch == "386"):
|
||||
return true
|
||||
default:
|
||||
|
|
|
|||
Loading…
Reference in New Issue