Browse code
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>
Christopher Jones authored on 2016/01/20 05:23:46Showing 2 changed files
| ... | ... |
@@ -211,6 +211,7 @@ test_env() {
|
| 211 | 211 |
# use "env -i" to tightly control the environment variables that bleed into the tests |
| 212 | 212 |
env -i \ |
| 213 | 213 |
DEST="$DEST" \ |
| 214 |
+ DOCKER_ENGINE_GOARCH="$DOCKER_ENGINE_GOARCH" \ |
|
| 214 | 215 |
DOCKER_GRAPHDRIVER="$DOCKER_GRAPHDRIVER" \ |
| 215 | 216 |
DOCKER_USERLANDPROXY="$DOCKER_USERLANDPROXY" \ |
| 216 | 217 |
DOCKER_HOST="$DOCKER_HOST" \ |
| ... | ... |
@@ -30,7 +30,7 @@ var ( |
| 30 | 30 |
"Test requires a Linux daemon", |
| 31 | 31 |
} |
| 32 | 32 |
NotArm = testRequirement{
|
| 33 |
- func() bool { return os.Getenv("DOCKER_ENGINE_GOARCH") == "arm" },
|
|
| 33 |
+ func() bool { return os.Getenv("DOCKER_ENGINE_GOARCH") != "arm" },
|
|
| 34 | 34 |
"Test requires a daemon not running on ARM", |
| 35 | 35 |
} |
| 36 | 36 |
SameHostDaemon = testRequirement{
|