From 232d7c095d5f5f08e07bad06bdc6ae9369380b78 Mon Sep 17 00:00:00 2001
From: Stefan Junker <mail@stefanjunker.de>
Date: Fri, 20 May 2016 11:33:23 +0200
Subject: [PATCH 1/2] test: fix bash variable escaping in sudo command

---
 test | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test b/test
index 634633f4..6db93b71 100755
--- a/test
+++ b/test
@@ -35,7 +35,7 @@ TEST=${split[@]/#/${REPO_PATH}/}
 
 echo -n "Running tests "
 function testrun {
-    sudo -E bash -c "umask 0; PATH=\$GOBIN:\$GOROOT/bin:\$PATH go test -covermode set $@"
+    sudo -E bash -c "umask 0; PATH=$GOROOT/bin:$GOBIN:$PATH go test -covermode set $@"
 }
 if [ ! -z "${COVERALLS}" ]; then
     echo "with coverage profile generation..."

From 54c0cd2cadc0567c8e4b457a772e155d7091f5c7 Mon Sep 17 00:00:00 2001
From: Stefan Junker <mail@stefanjunker.de>
Date: Fri, 20 May 2016 12:38:19 +0200
Subject: [PATCH 2/2] build: remove -x bash flag

---
 build | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build b/build
index c6d60ff8..4f5cfc79 100755
--- a/build
+++ b/build
@@ -1,5 +1,5 @@
 #!/usr/bin/env bash
-set -xe
+set -e
 
 ORG_PATH="github.com/containernetworking"
 REPO_PATH="${ORG_PATH}/cni"