summaryrefslogtreecommitdiff
path: root/tests/topotests/docker
diff options
context:
space:
mode:
authorChristian Franke <chris@opensourcerouting.org>2018-11-29 16:05:44 +0100
committerChristian Franke <chris@opensourcerouting.org>2018-11-29 16:51:27 +0100
commit5f1ac6d6692228eeb516de6e3a79aa8fe576cfed (patch)
tree65e67176ee5e029048a80bc1a36fa676a5d46afe /tests/topotests/docker
parentff37641ba2e8272ed4f58a88a9f837d5ff9bb560 (diff)
topotests: Only set -t when input is a terminal
Signed-off-by: Christian Franke <chris@opensourcerouting.org>
Diffstat (limited to 'tests/topotests/docker')
-rwxr-xr-xtests/topotests/docker/frr-topotests.sh6
1 files changed, 5 insertions, 1 deletions
diff --git a/tests/topotests/docker/frr-topotests.sh b/tests/topotests/docker/frr-topotests.sh
index 9a157c49a8..673354f5da 100755
--- a/tests/topotests/docker/frr-topotests.sh
+++ b/tests/topotests/docker/frr-topotests.sh
@@ -130,7 +130,7 @@ if [ -z "$TOPOTEST_BUILDCACHE" ]; then
|| docker volume create "${TOPOTEST_BUILDCACHE}"
fi
-set -- --rm -ti \
+set -- --rm -i \
-v "$TOPOTEST_LOGS:/tmp" \
-v "$TOPOTEST_FRR:/root/host-frr:ro" \
-v "$TOPOTEST_FRR/tests/topotests:/root/topotests:ro" \
@@ -143,4 +143,8 @@ set -- --rm -ti \
$TOPOTEST_OPTIONS \
frrouting/frr:topotests-latest "$@"
+if [ -t 0 ]; then
+ set -- -t "$@"
+fi
+
exec docker run "$@"