From ec6659a1216fbfe3fead759b0220501847d12e28 Mon Sep 17 00:00:00 2001 From: Dennis Chen Date: Mon, 8 Jan 2018 06:15:24 +0000 Subject: [PATCH] busybox: use '-v' option for 'cat' Use `cat -v` command instead of `catv` for the latest version of busybox(V1.28.0) with multi-arch Signed-off-by: Dennis Chen --- integration-cli/docker_cli_run_test.go | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/integration-cli/docker_cli_run_test.go b/integration-cli/docker_cli_run_test.go index 1749df07c1..b5dca1ec3c 100644 --- a/integration-cli/docker_cli_run_test.go +++ b/integration-cli/docker_cli_run_test.go @@ -2239,7 +2239,16 @@ func (s *DockerSuite) TestRunSlowStdoutConsumer(c *check.C) { // TODO Windows: This should be able to run on Windows if can find an // alternate to /dev/zero and /dev/stdout. testRequires(c, DaemonIsLinux) - cont := exec.Command(dockerBinary, "run", "--rm", "busybox", "/bin/sh", "-c", "dd if=/dev/zero of=/dev/stdout bs=1024 count=2000 | catv") + + // TODO will remove this if issue #35963 fixed + var args []string + if runtime.GOARCH == "amd64" { + args = []string{"run", "--rm", "busybox", "/bin/sh", "-c", "dd if=/dev/zero of=/dev/stdout bs=1024 count=2000 | catv"} + } else { + args = []string{"run", "--rm", "busybox", "/bin/sh", "-c", "dd if=/dev/zero of=/dev/stdout bs=1024 count=2000 | cat -v"} + } + + cont := exec.Command(dockerBinary, args...) stdout, err := cont.StdoutPipe() if err != nil {