From d12f4babdd08acd3cf64c2ee4a9550c81d534816 Mon Sep 17 00:00:00 2001 From: Christopher Jones Date: Tue, 19 Jan 2016 15:23:46 -0500 Subject: [PATCH] Fix test requirement for ARM Correctly passes the DOCKER_ENGINE_GOARCH env var to the testing environment Also fixes logic for skipping a test if on ARM. Signed-off-by: Christopher Jones --- hack/make.sh | 1 + integration-cli/requirements.go | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/hack/make.sh b/hack/make.sh index d68b9bf73b..8a1981f609 100755 --- a/hack/make.sh +++ b/hack/make.sh @@ -211,6 +211,7 @@ test_env() { # use "env -i" to tightly control the environment variables that bleed into the tests env -i \ DEST="$DEST" \ + DOCKER_ENGINE_GOARCH="$DOCKER_ENGINE_GOARCH" \ DOCKER_GRAPHDRIVER="$DOCKER_GRAPHDRIVER" \ DOCKER_USERLANDPROXY="$DOCKER_USERLANDPROXY" \ DOCKER_HOST="$DOCKER_HOST" \ diff --git a/integration-cli/requirements.go b/integration-cli/requirements.go index 08b59da206..f155e226f2 100644 --- a/integration-cli/requirements.go +++ b/integration-cli/requirements.go @@ -30,7 +30,7 @@ var ( "Test requires a Linux daemon", } NotArm = testRequirement{ - func() bool { return os.Getenv("DOCKER_ENGINE_GOARCH") == "arm" }, + func() bool { return os.Getenv("DOCKER_ENGINE_GOARCH") != "arm" }, "Test requires a daemon not running on ARM", } SameHostDaemon = testRequirement{