diff options
| author | Brian Coca <brian.coca+git@gmail.com> | 2016-05-03 10:38:54 -0400 |
|---|---|---|
| committer | Brian Coca <brian.coca+git@gmail.com> | 2016-05-03 10:38:54 -0400 |
| commit | 3669ab24563c09fc06348f404f881710062998ad (patch) | |
| tree | c6b870df39f59978ff5e38f2da33630c4a346593 | |
| parent | 3f104dcee9f6c0da9dd9c6c045979edf999ea929 (diff) | |
| download | ansible-3669ab24563c09fc06348f404f881710062998ad.tar.gz | |
added defaults for 'optional' vars
| -rwxr-xr-x | test/utils/run_tests.sh | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/test/utils/run_tests.sh b/test/utils/run_tests.sh index eefb562f20..352e3841c0 100755 --- a/test/utils/run_tests.sh +++ b/test/utils/run_tests.sh @@ -14,8 +14,8 @@ if [ "${TARGET}" = "sanity" ]; then else export C_NAME="testAbull_$$_$(cat /dev/urandom | tr -dc 'a-zA-Z0-9' | fold -w 8 | head -n 1)" docker pull ansible/ansible:${TARGET} - docker run -d --volume="${PWD}:/root/ansible:Z" --name "${C_NAME}" ${TARGET_OPTIONS} ansible/ansible:${TARGET} > /tmp/cid_${TARGET} - docker exec -ti $(cat /tmp/cid_${TARGET}) /bin/sh -c "export TEST_FLAGS='${TEST_FLAGS}'; cd /root/ansible; . hacking/env-setup; (cd test/integration; LC_ALL=en_US.utf-8 make)" + docker run -d --volume="${PWD}:/root/ansible:Z" --name "${C_NAME}" ${TARGET_OPTIONS:=''} ansible/ansible:${TARGET} > /tmp/cid_${TARGET} + docker exec -ti $(cat /tmp/cid_${TARGET}) /bin/sh -c "export TEST_FLAGS='${TEST_FLAGS:-''}'; cd /root/ansible; . hacking/env-setup; (cd test/integration; LC_ALL=en_US.utf-8 make)" docker kill $(cat /tmp/cid_${TARGET}) if [ "X${TESTS_KEEP_CONTAINER}" = "X" ]; then |