From 3e617d986850b9922c543471c32bb891bb8494ee Mon Sep 17 00:00:00 2001
From: Anusha Ragunathan <anusha@docker.com>
Date: Tue, 14 Jun 2016 12:56:38 -0700
Subject: [PATCH] Dont leak DOCKER_INCREMENTAL_BINARY flag into go test.

Signed-off-by: Anusha Ragunathan <anusha@docker.com>
Upstream-commit: 379ec38222541015acabf4001b57475e45f75918
Component: engine
---
 components/engine/hack/make/test-unit | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/components/engine/hack/make/test-unit b/components/engine/hack/make/test-unit
index eee9789662..17a761ef46 100644
--- a/components/engine/hack/make/test-unit
+++ b/components/engine/hack/make/test-unit
@@ -9,6 +9,16 @@ set -e
 #
 bundle_test_unit() {
 	TESTFLAGS+=" -test.timeout=${TIMEOUT}"
+	INCBUILD="-i"
+	count=0
+	for flag in "${BUILDFLAGS[@]}"; do
+		if [ "${flag}" == ${INCBUILD} ]; then
+			unset BUILDFLAGS[${count}]
+			break
+		fi
+		count=$[ ${count} + 1 ]
+	done
+
 	date
 	if [ -z "$TESTDIRS" ]; then
 		TEST_PATH=./...