Merge pull request #23538 from anusha-ragunathan/incremental-builds

Dont leak DOCKER_INCREMENTAL_BINARY flag into go test.
Upstream-commit: 64eb01caf6490b57163e55588bcf295d9645fdae
Component: engine

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=./...