On 08/30/2017 12:52 PM, Jeff Cody wrote: > Right now, all qemu-iotests output data into the same scratch directory, > and so each test needs to be responsible for cleaning up its own files. > > Have each test use 'scratch/$seq' as its temp directory, so the check > script can do simple cleanup of removing the whole temporary directory. > > Reviewed-by: Eric Blake <ebl...@redhat.com> > Signed-off-by: Jeff Cody <jc...@redhat.com> > --- > tests/qemu-iotests/check | 21 +++++++++++++++++---- > 1 file changed, 17 insertions(+), 4 deletions(-) > > diff --git a/tests/qemu-iotests/check b/tests/qemu-iotests/check > index d504b6e..f6ca85d 100755 > --- a/tests/qemu-iotests/check > +++ b/tests/qemu-iotests/check > @@ -243,6 +243,7 @@ seq="check" > > for seq in $list > do > + TEST_DIR_SEQ=$TEST_DIR/$seq > err=false > printf %s "$seq" > if [ -n "$TESTS_REMAINING_LOG" ] ; then > @@ -289,13 +290,23 @@ do > fi > export OUTPUT_DIR=$PWD > if $debug; then > - (cd "$source_iotests"; > + ( > + export TEST_DIR=$TEST_DIR_SEQ > + . "$source_iotests/common.config" > + . "$source_iotests/common.rc"
What purpose do these serve? > + cd "$source_iotests" && > MALLOC_PERTURB_=${MALLOC_PERTURB_:-$(($RANDOM % 255 + 1))} \ > - $run_command -d 2>&1 | tee $tmp.out) > + $run_command -d 2>&1 | tee $tmp.out > + ) > else > - (cd "$source_iotests"; > + ( > + export TEST_DIR=$TEST_DIR_SEQ > + . "$source_iotests/common.config" > + . "$source_iotests/common.rc" > + cd "$source_iotests" && > MALLOC_PERTURB_=${MALLOC_PERTURB_:-$(($RANDOM % 255 + 1))} \ > - $run_command >$tmp.out 2>&1) > + $run_command >$tmp.out 2>&1 > + ) > fi > sts=$? > $timestamp && _timestamp > @@ -359,6 +370,8 @@ do > fi > fi > > + rm -rf "$TEST_DIR_SEQ" > + > fi > > # come here for each test, except when $showme is true > Seems OK to me, though I am not able to answer all doubts about exactly how this may effect the strange pipe/subshell arrangements that occur deeper in the bowels of the included files for launching QEMU and so on.. I suppose that might be related to the inclusion of those common.XYZ files? Tested-by: John Snow <js...@redhat.com> Reviewed-by: John Snow <js...@redhat.com>