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 <dennis.chen@arm.com>
This commit is contained in:
parent
f88c2c04ef
commit
ec6659a121
|
@ -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
|
// TODO Windows: This should be able to run on Windows if can find an
|
||||||
// alternate to /dev/zero and /dev/stdout.
|
// alternate to /dev/zero and /dev/stdout.
|
||||||
testRequires(c, DaemonIsLinux)
|
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()
|
stdout, err := cont.StdoutPipe()
|
||||||
if err != nil {
|
if err != nil {
|
||||||
|
|
Loading…
Reference in New Issue