Skip to content

Commit 4f48327

Browse files
author
Ian Campbell
committed
e2e: assign a default value of 0 to DOCKERD_EXPERIMENTAL
Currently running the e2e tests produces a warning/error: $ make -f docker.Makefile test-e2e «...» docker run --rm -v /var/run/docker.sock:/var/run/docker.sock docker-cli-e2e ./scripts/test/e2e/run: line 20: test: : integer expression expected This is from: test "${DOCKERD_EXPERIMENTAL:-}" -eq "1" && «...» Where `${DOCKERD_EXPERIMENTAL:-}` expands to the empty string, resulting in `test "" -eq "1"` which produces the warning. This error is enough to trigger the short-circuiting behaviour of `&&` so the result is as expected, but fix the issue nonetheless by provdiing a default `0`. Signed-off-by: Ian Campbell <ijc@docker.com>
1 parent 5d2a065 commit 4f48327

1 file changed

Lines changed: 1 addition & 1 deletion

File tree

  • scripts/test/e2e

scripts/test/e2e/run

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ function setup {
1717
local project=$1
1818
local file=$2
1919

20-
test "${DOCKERD_EXPERIMENTAL:-}" -eq "1" && file="${file}:./e2e/compose-env.experimental.yaml"
20+
test "${DOCKERD_EXPERIMENTAL:-0}" -eq "1" && file="${file}:./e2e/compose-env.experimental.yaml"
2121

2222
if [[ "${TEST_CONNHELPER:-}" = "ssh" ]];then
2323
test ! -f "${HOME}/.ssh/id_rsa" && ssh-keygen -t rsa -C docker-e2e-dummy -N "" -f "${HOME}/.ssh/id_rsa" -q

0 commit comments

Comments
 (0)