From 3e8cd7b94e1c2b21b162ddf3ba20a0cea909fdd6 Mon Sep 17 00:00:00 2001
From: Davanum Srinivas <davanum@gmail.com>
Date: Wed, 29 Mar 2017 12:50:41 -0400
Subject: [PATCH] Update build environment

* Add mercurial/hg to bindep
* Use latest golang (1.8.x)
* Print additional go related environment information

Change-Id: I053873945a24ab0f592051423d2e307b3bdf299e
---
 Makefile            | 2 ++
 bindep.txt          | 1 +
 tools/test-setup.sh | 5 +++--
 3 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/Makefile b/Makefile
index 6f37537..88045b4 100644
--- a/Makefile
+++ b/Makefile
@@ -65,6 +65,8 @@ env:
 	@echo "GOROOT: $(GOROOT)"
 	@echo "DEST: $(DEST)"
 	@echo "PKG: $(PKG)"
+	go version
+	go env
 
 # Get our dev/test dependencies in place
 bootstrap:
diff --git a/bindep.txt b/bindep.txt
index 5e3550e..656f435 100644
--- a/bindep.txt
+++ b/bindep.txt
@@ -1,5 +1,6 @@
 pkg-config
 build-essential
+mercurial
 golang-go
 golint
 make
diff --git a/tools/test-setup.sh b/tools/test-setup.sh
index 4ae7853..cc51bb3 100755
--- a/tools/test-setup.sh
+++ b/tools/test-setup.sh
@@ -48,7 +48,8 @@ case $OS in
         if ! which add-apt-repository 1>/dev/null; then
             sudo $APT_GET install software-properties-common
         fi
-        sudo add-apt-repository --yes ppa:masterminds/glide && sudo apt-get update
-        sudo $APT_GET install glide
+        sudo add-apt-repository --yes ppa:longsleep/golang-backports
+        sudo add-apt-repository --yes ppa:masterminds/glide
+        sudo apt-get update && sudo $APT_GET install golang-go glide
         ;;
 esac