diff options
| author | Ruediger Meier | 2018-03-09 03:04:15 +0100 |
|---|---|---|
| committer | Ruediger Meier | 2018-03-09 09:57:23 +0100 |
| commit | c16590f2eed7c9593566d912b18ff3bd57a1babe (patch) | |
| tree | dc59ad77a1ed1980a1171f3dde459646feb23af8 /tests | |
| parent | travis: homebrew/dupes was deprecated (diff) | |
| download | kernel-qcow2-util-linux-c16590f2eed7c9593566d912b18ff3bd57a1babe.tar.gz kernel-qcow2-util-linux-c16590f2eed7c9593566d912b18ff3bd57a1babe.tar.xz kernel-qcow2-util-linux-c16590f2eed7c9593566d912b18ff3bd57a1babe.zip | |
tests: fix losetup race
Also avoid some "no-reentrant" tests.
Signed-off-by: Ruediger Meier <ruediger.meier@ga-group.nl>
Diffstat (limited to 'tests')
| -rwxr-xr-x | tests/ts/libmount/loop | 48 | ||||
| -rwxr-xr-x | tests/ts/libmount/loop-overlay | 3 |
2 files changed, 19 insertions, 32 deletions
diff --git a/tests/ts/libmount/loop b/tests/ts/libmount/loop index 09e894761..b52b7476a 100755 --- a/tests/ts/libmount/loop +++ b/tests/ts/libmount/loop @@ -117,38 +117,26 @@ ts_log "Success" ts_finalize_subtest ts_init_subtest "o-loop-val-initialized" -if [ "$TS_PARALLEL" = "yes" ]; then - # There is a race in $LODEV is usage - ts_skip_subtest "no-reentrant" -else - [ -d "$TS_MOUNTPOINT" ] || mkdir -p $TS_MOUNTPOINT - LODEV=$( $TS_CMD_LOSETUP --find 2>> $TS_OUTPUT ) - $TS_CMD_LOSETUP $LODEV "$BACKFILE" >> $TS_OUTPUT 2>&1 - $TS_CMD_MOUNT -oloop=$LODEV "$BACKFILE" "$TS_MOUNTPOINT" 2>&1 \ - | sed 's/:.*:/: <target>/; s/for .*/for <source>/' > $TS_OUTPUT - $TS_CMD_LOSETUP --detach $LODEV >> $TS_OUTPUT 2>&1 - udevadm settle - ts_log "Success" - ts_finalize_subtest -fi +[ -d "$TS_MOUNTPOINT" ] || mkdir -p $TS_MOUNTPOINT +LODEV=$( $TS_CMD_LOSETUP --show -f "$BACKFILE" 2>>$TS_OUTPUT) +$TS_CMD_MOUNT -oloop=$LODEV "$BACKFILE" "$TS_MOUNTPOINT" 2>&1 \ + | sed 's/:.*:/: <target>/; s/for .*/for <source>/' > $TS_OUTPUT +$TS_CMD_LOSETUP --detach $LODEV >> $TS_OUTPUT 2>&1 +udevadm settle +ts_log "Success" +ts_finalize_subtest ts_init_subtest "o-loop-val-conflict" -if [ "$TS_PARALLEL" = "yes" ]; then - # There is a race in $LODEV is usage - ts_skip_subtest "no-reentrant" -else - [ -d "$TS_MOUNTPOINT" ] || mkdir -p $TS_MOUNTPOINT - cp "$BACKFILE" "$BACKFILE"-2 - LODEV=$( $TS_CMD_LOSETUP --find 2>> $TS_OUTPUT ) - $TS_CMD_LOSETUP $LODEV "$BACKFILE"-2 >> $TS_OUTPUT 2>&1 - $TS_CMD_MOUNT -oloop=$LODEV "$BACKFILE" "$TS_MOUNTPOINT" 2>&1 \ - | sed 's/:.*:/: <target>/; s/for .*/for <source>/' > $TS_OUTPUT - $TS_CMD_LOSETUP --detach $LODEV >> $TS_OUTPUT 2>&1 - rm "$BACKFILE"-2 - udevadm settle - ts_log "Success" - ts_finalize_subtest -fi +[ -d "$TS_MOUNTPOINT" ] || mkdir -p $TS_MOUNTPOINT +cp "$BACKFILE" "$BACKFILE"-2 +LODEV=$( $TS_CMD_LOSETUP --show -f "$BACKFILE"-2 2>> $TS_OUTPUT) +$TS_CMD_MOUNT -oloop=$LODEV "$BACKFILE" "$TS_MOUNTPOINT" 2>&1 \ + | sed 's/:.*:/: <target>/; s/for .*/for <source>/' > $TS_OUTPUT +$TS_CMD_LOSETUP --detach $LODEV >> $TS_OUTPUT 2>&1 +rm "$BACKFILE"-2 +udevadm settle +ts_log "Success" +ts_finalize_subtest ts_log "Success" ts_finalize diff --git a/tests/ts/libmount/loop-overlay b/tests/ts/libmount/loop-overlay index df096bf30..fffb823c0 100755 --- a/tests/ts/libmount/loop-overlay +++ b/tests/ts/libmount/loop-overlay @@ -54,8 +54,7 @@ $TS_CMD_UMOUNT "$TS_MOUNTPOINT-1" >> $TS_OUTPUT 2>&1 $TS_CMD_UMOUNT "$TS_MOUNTPOINT-2" >> $TS_OUTPUT 2>&1 echo "both should fail" >>$TS_OUTPUT -LOOPDEV=$($TS_CMD_LOSETUP --find) -$TS_CMD_LOSETUP --offset 1 --sizelimit $OFFSET $LOOPDEV "$IMG" +LOOPDEV=$($TS_CMD_LOSETUP --show -f --offset 1 --sizelimit $OFFSET "$IMG") $TS_CMD_MOUNT -oloop,sizelimit=$OFFSET "$IMG" "$TS_MOUNTPOINT-1" 2>&1 \ | sed 's/:.*:/: <target>/; s/for .*/for <source>/' >> $TS_OUTPUT $TS_CMD_MOUNT -oloop,offset=$OFFSET "$IMG" "$TS_MOUNTPOINT-2" 2>&1 \ |