Commit 079eb8ab authored by Arnaud Rebillout's avatar Arnaud Rebillout

Revert "Add patch to fix hack/test/unit"

This reverts commit 97e0b570.
parent 87640675
Origin: https://github.com/moby/moby/pull/39935
From: Arnaud Rebillout <arnaud.rebillout@collabora.com>
Date: Mon, 16 Sep 2019 09:33:48 +0700
Subject: [PATCH] hack: Re-introduce leading space in TESTFLAGS
The leading space was lost in 42f0a0db75a921145c7f519f7b550e1392890da2.
This is not OK, as these testflags are appended to existing testflags,
and without a space you get something like that:
gotestsum ... -test.short-test.timeout=5m ...
Signed-off-by: Arnaud Rebillout <arnaud.rebillout@collabora.com>
---
hack/test/unit | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/engine/hack/test/unit b/engine/hack/test/unit
index 1aea06c54b..a47a93935f 100755
--- a/engine/hack/test/unit
+++ b/engine/hack/test/unit
@@ -13,7 +13,7 @@
set -eu -o pipefail
BUILDFLAGS=( -tags 'netgo seccomp libdm_no_deferred_remove' )
-TESTFLAGS+="-test.timeout=${TIMEOUT:-5m}"
+TESTFLAGS+=" -test.timeout=${TIMEOUT:-5m}"
TESTDIRS="${TESTDIRS:-./...}"
exclude_paths='/vendor/|/integration'
pkg_list=$(go list $TESTDIRS | grep -vE "($exclude_paths)")
--
2.20.1
......@@ -12,7 +12,6 @@ buildkit-build-against-google-grpc-1.11.patch
cli-fix-manpages-build-script.patch
engine-contrib-debootstrap-curl-follow-location.patch
engine-hack-Re-introduce-leading-space-in-TESTFLAGS.patch
export_oci-caps.patch
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment