On 05/22/2015 04:31 PM, Eric Blake wrote: > On 05/22/2015 02:17 PM, John Snow wrote: >> If you are running out-of-tree, the -x option to exclude a >> certain iotest is broken. >> >> Replace porcelain usage of ls with a sturdier grep command. >> >> Signed-off-by: John Snow <js...@redhat.com> --- >> tests/qemu-iotests/common | 3 ++- 1 file changed, 2 >> insertions(+), 1 deletion(-) >> >> diff --git a/tests/qemu-iotests/common >> b/tests/qemu-iotests/common index 1e556bb..c4d0742 100644 --- >> a/tests/qemu-iotests/common +++ b/tests/qemu-iotests/common @@ >> -82,7 +82,8 @@ s/ .*//p elif $xgroup then # arg after -x - >> [ ! -s $tmp.list ] && ls [0-9][0-9][0-9] [0-9][0-9][0-9][0-9] >> >$tmp.list 2>/dev/null + # Populate $tmp.list with all >> tests + grep -oh -E "^([0-9]{3,})" >> "${source_iotests}/group" > $tmp.list 2>/dev/null > > 'grep -oh' is a GNU-ism; is it going to cause grief on BSD > platforms? >
It might... I'll look at other options. awk is probably fine here for printing column 1. --js