diff options
| author | Christopher Jones <tophj@linux.vnet.ibm.com> | 2016-01-19 15:23:46 -0500 |
|---|---|---|
| committer | Christopher Jones <tophj@linux.vnet.ibm.com> | 2016-01-19 15:23:46 -0500 |
| commit | d12f4babdd08acd3cf64c2ee4a9550c81d534816 (patch) | |
| tree | 144a9e906bb5e7f3fac2f56419aef12848f4d0f3 /hack/make.sh | |
| parent | 4b63689679089f7bb2286e7c330d6a7884c0aec3 (diff) | |
| download | docker-d12f4babdd08acd3cf64c2ee4a9550c81d534816.tar.gz | |
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 <tophj@linux.vnet.ibm.com>
Diffstat (limited to 'hack/make.sh')
| -rwxr-xr-x | hack/make.sh | 1 |
1 files changed, 1 insertions, 0 deletions
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" \ |