From 69d8fe5b4f794af4f45e2cbdb2ebcb04f3fcd447 Mon Sep 17 00:00:00 2001 From: Alexander Neumann Date: Sun, 21 Aug 2016 14:21:19 +0200 Subject: [PATCH 1/2] Add check for cross-compilation --- run_integration_tests.go | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/run_integration_tests.go b/run_integration_tests.go index ace2fc4c6..249839628 100644 --- a/run_integration_tests.go +++ b/run_integration_tests.go @@ -323,11 +323,14 @@ func (env *TravisEnvironment) RunTests() error { if *runCrossCompile && !(runtime.Version() < "go1.7") { // compile for all target architectures with tags for _, tags := range []string{"release", "debug"} { - runWithEnv(env.env, "gox", "-verbose", + err := runWithEnv(env.env, "gox", "-verbose", "-osarch", strings.Join(env.goxOSArch, " "), "-tags", tags, "-output", "/tmp/{{.Dir}}_{{.OS}}_{{.Arch}}", "cmds/restic") + if err != nil { + return err + } } } From 5061607e7781088541edcb9be9408a993dfab145 Mon Sep 17 00:00:00 2001 From: Alexander Neumann Date: Sun, 21 Aug 2016 14:59:15 +0200 Subject: [PATCH 2/2] x/sys/unix: Manually add FADV_* constants for Linux/arm --- vendor/src/golang.org/x/sys/unix/ztypes_linux_arm.go | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/vendor/src/golang.org/x/sys/unix/ztypes_linux_arm.go b/vendor/src/golang.org/x/sys/unix/ztypes_linux_arm.go index 817ac9c29..66f8d1175 100644 --- a/vendor/src/golang.org/x/sys/unix/ztypes_linux_arm.go +++ b/vendor/src/golang.org/x/sys/unix/ztypes_linux_arm.go @@ -145,6 +145,15 @@ type Fsid struct { X__val [2]int32 } +const ( + FADV_NORMAL = 0x0 + FADV_RANDOM = 0x1 + FADV_SEQUENTIAL = 0x2 + FADV_WILLNEED = 0x3 + FADV_DONTNEED = 0x4 + FADV_NOREUSE = 0x5 +) + type Flock_t struct { Type int16 Whence int16