| Message ID | 1344524511-9682-1-git-send-email-kwolf@redhat.com |
|---|---|
| State | New |
| Headers | show |
On 08/09/2012 09:01 AM, Kevin Wolf wrote: > Instead of building a huge pipeline, just pass all expressions to a > single sed process. > > Suggested-by: Eric Blake <eblake@redhat.com> > Signed-off-by: Kevin Wolf <kwolf@redhat.com> > --- > tests/qemu-iotests/common.rc | 20 ++++++++++---------- > 1 files changed, 10 insertions(+), 10 deletions(-) Reviewed-by: Eric Blake <eblake@redhat.com> > > diff --git a/tests/qemu-iotests/common.rc b/tests/qemu-iotests/common.rc > index 7782808..6b80516 100644 > --- a/tests/qemu-iotests/common.rc > +++ b/tests/qemu-iotests/common.rc > @@ -105,16 +105,16 @@ _make_test_img() > > # XXX(hch): have global image options? > $QEMU_IMG create -f $IMGFMT $extra_img_options $TEST_IMG $image_size | \ > - sed -e "s#$IMGPROTO:$TEST_DIR#TEST_DIR#g" | \ > + sed -e "s#$IMGPROTO:$TEST_DIR#TEST_DIR#g" \ and nice to get rid of that space-followed-by-TAB indent.
diff --git a/tests/qemu-iotests/common.rc b/tests/qemu-iotests/common.rc index 7782808..6b80516 100644 --- a/tests/qemu-iotests/common.rc +++ b/tests/qemu-iotests/common.rc @@ -105,16 +105,16 @@ _make_test_img() # XXX(hch): have global image options? $QEMU_IMG create -f $IMGFMT $extra_img_options $TEST_IMG $image_size | \ - sed -e "s#$IMGPROTO:$TEST_DIR#TEST_DIR#g" | \ - sed -e "s#$TEST_DIR#TEST_DIR#g" | \ - sed -e "s#$IMGFMT#IMGFMT#g" | \ - sed -e "s# encryption=off##g" | \ - sed -e "s# cluster_size=[0-9]\\+##g" | \ - sed -e "s# table_size=[0-9]\\+##g" | \ - sed -e "s# compat='[^']*'##g" | \ - sed -e "s# compat6=\\(on\\|off\\)##g" | \ - sed -e "s# static=\\(on\\|off\\)##g" | \ - sed -e "s# lazy_refcounts=\\(on\\|off\\)##g" + sed -e "s#$IMGPROTO:$TEST_DIR#TEST_DIR#g" \ + -e "s#$TEST_DIR#TEST_DIR#g" \ + -e "s#$IMGFMT#IMGFMT#g" \ + -e "s# encryption=off##g" \ + -e "s# cluster_size=[0-9]\\+##g" \ + -e "s# table_size=[0-9]\\+##g" \ + -e "s# compat='[^']*'##g" \ + -e "s# compat6=\\(on\\|off\\)##g" \ + -e "s# static=\\(on\\|off\\)##g" \ + -e "s# lazy_refcounts=\\(on\\|off\\)##g" } _cleanup_test_img()
Instead of building a huge pipeline, just pass all expressions to a single sed process. Suggested-by: Eric Blake <eblake@redhat.com> Signed-off-by: Kevin Wolf <kwolf@redhat.com> --- tests/qemu-iotests/common.rc | 20 ++++++++++---------- 1 files changed, 10 insertions(+), 10 deletions(-)