From 635a7bfc437f63461eeee2f0dfc19f9b6ae7dced Mon Sep 17 00:00:00 2001
From: Aliaksandr Valialkin <valyala@gmail.com>
Date: Tue, 1 Dec 2015 20:32:28 +0200
Subject: [PATCH] Revert "An attempt to enable real cross-compilation in travis
 according to
 https://github.com/travis-ci/travis-ci/issues/2517#issuecomment-48725040"

It looks like travis doesn't support gvm on testing step:

    $ gvm cross $BUILD_GOOS $BUILD_GOARCH
    /home/travis/build.sh: line 45: gvm: command not found

This reverts commit ac99921fa1fee988c0f0e12731120fe9e4653d1d.
---
 .travis.yml | 30 ++++++++++++------------------
 1 file changed, 12 insertions(+), 18 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index ca6ba24..c929c5c 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -4,22 +4,16 @@ go:
   - 1.5.1
   - tip
 
-# The following snippet has been stolen
-# from https://github.com/travis-ci/travis-ci/issues/2517#issuecomment-48725040
 env:
-  - BUILD_GOOS=linux BUILD_GOARCH=amd64
-  - BUILD_GOOS=linux BUILD_GOARCH=386
-  - BUILD_GOOS=linux BUILD_GOARCH=arm
-  - BUILD_GOOS=linux BUILD_GOARCH=arm64
-  - BUILD_GOOS=linux BUILD_GOARCH=ppc64
-  - BUILD_GOOS=darwin BUILD_GOARCH=amd64
-  - BUILD_GOOS=darwin BUILD_GOARCH=386
-  - BUILD_GOOS=darwin BUILD_GOARCH=arm
-  - BUILD_GOOS=darwin BUILD_GOARCH=arm64
-  - BUILD_GOOS=freebsd BUILD_GOARCH=amd64
-  - BUILD_GOOS=freebsd BUILD_GOARCH=386
-  - BUILD_GOOS=freebsd BUILD_GOARCH=arm
-
-script:
-  - gvm cross $BUILD_GOOS $BUILD_GOARCH
-  - GOOS=$BUILD_GOOS GOARCH=$BUILD_GOARCH go test ./...
+  - GOOS=linux GOARCH=amd64
+  - GOOS=linux GOARCH=386
+  - GOOS=linux GOARCH=arm
+  - GOOS=linux GOARCH=arm64
+  - GOOS=linux GOARCH=ppc64
+  - GOOS=darwin GOARCH=amd64
+  - GOOS=darwin GOARCH=386
+  - GOOS=darwin GOARCH=arm
+  - GOOS=darwin GOARCH=arm64
+  - GOOS=freebsd GOARCH=amd64
+  - GOOS=freebsd GOARCH=386
+  - GOOS=freebsd GOARCH=arm