Merge pull request #271 from restic/go1.5

travis: add go1.5

.travis.yml

@@ -4,13 +4,12 @@ sudo: false
 go:
   - 1.3.3
   - 1.4.2
+  - 1.5
 
 os:
   - linux
   - osx
 
-env: GOX_OS="linux darwin openbsd freebsd windows" GOX_ARCH="386 amd64 arm"
-
 notifications:
   irc:
     channels:

run_integration_tests.go

@@ -47,9 +47,12 @@ func (env *TravisEnvironment) Prepare() {
 	}
 
 	msg("gox: OS %v, ARCH %v\n", env.goxOS, env.goxArch)
-	run("gox", "-build-toolchain",
+
-		"-os", strings.Join(env.goxOS, " "),
+	if !strings.HasPrefix(runtime.Version(), "go1.5") {
-		"-arch", strings.Join(env.goxArch, " "))
+		run("gox", "-build-toolchain",
+			"-os", strings.Join(env.goxOS, " "),
+			"-arch", strings.Join(env.goxArch, " "))
+	}
 }
 
 func (env *TravisEnvironment) RunTests() {