| Message ID | 20190507183610.9848-5-mreitz@redhat.com |
|---|---|
| State | New |
| Headers | show |
| Series | iotests: Let 233 run concurrently | expand |
On 5/7/19 1:36 PM, Max Reitz wrote: > Signed-off-by: Max Reitz <mreitz@redhat.com> > --- > tests/qemu-iotests/common.rc | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/tests/qemu-iotests/common.rc b/tests/qemu-iotests/common.rc > index 93f87389b6..217cf3874d 100644 > --- a/tests/qemu-iotests/common.rc > +++ b/tests/qemu-iotests/common.rc > @@ -106,8 +106,8 @@ _qemu_io_wrapper() > _qemu_nbd_wrapper() > { > ( > - echo $BASHPID > "${QEMU_TEST_DIR}/qemu-nbd.pid" > - exec "$QEMU_NBD_PROG" $QEMU_NBD_OPTIONS "$@" > + exec "$QEMU_NBD_PROG" --pid-file="${QEMU_TEST_DIR}/qemu-nbd.pid" \ > + $QEMU_NBD_OPTIONS "$@" > ) Beforehand, we needed the subshell + exec to guarantee that the pid we were writing was that of the subshell. Now, we don't need either; this could be simplified to: _qemu_nbd_wrapper() { "$QEMU_NBD_PROG" --pid-file... "$@" }
On 07.05.19 21:53, Eric Blake wrote: > On 5/7/19 1:36 PM, Max Reitz wrote: >> Signed-off-by: Max Reitz <mreitz@redhat.com> >> --- >> tests/qemu-iotests/common.rc | 4 ++-- >> 1 file changed, 2 insertions(+), 2 deletions(-) >> >> diff --git a/tests/qemu-iotests/common.rc b/tests/qemu-iotests/common.rc >> index 93f87389b6..217cf3874d 100644 >> --- a/tests/qemu-iotests/common.rc >> +++ b/tests/qemu-iotests/common.rc >> @@ -106,8 +106,8 @@ _qemu_io_wrapper() >> _qemu_nbd_wrapper() >> { >> ( >> - echo $BASHPID > "${QEMU_TEST_DIR}/qemu-nbd.pid" >> - exec "$QEMU_NBD_PROG" $QEMU_NBD_OPTIONS "$@" >> + exec "$QEMU_NBD_PROG" --pid-file="${QEMU_TEST_DIR}/qemu-nbd.pid" \ >> + $QEMU_NBD_OPTIONS "$@" >> ) > > Beforehand, we needed the subshell + exec to guarantee that the pid we > were writing was that of the subshell. Now, we don't need either; this > could be simplified to: > > _qemu_nbd_wrapper() > { > "$QEMU_NBD_PROG" --pid-file... "$@" > } True, but I just followed _qemu_img_wrapper()’s example. I could change both, of course... Max
diff --git a/tests/qemu-iotests/common.rc b/tests/qemu-iotests/common.rc index 93f87389b6..217cf3874d 100644 --- a/tests/qemu-iotests/common.rc +++ b/tests/qemu-iotests/common.rc @@ -106,8 +106,8 @@ _qemu_io_wrapper() _qemu_nbd_wrapper() { ( - echo $BASHPID > "${QEMU_TEST_DIR}/qemu-nbd.pid" - exec "$QEMU_NBD_PROG" $QEMU_NBD_OPTIONS "$@" + exec "$QEMU_NBD_PROG" --pid-file="${QEMU_TEST_DIR}/qemu-nbd.pid" \ + $QEMU_NBD_OPTIONS "$@" ) }
Signed-off-by: Max Reitz <mreitz@redhat.com> --- tests/qemu-iotests/common.rc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)