diff options
| author | Karel Zak | 2017-04-28 11:19:59 +0200 |
|---|---|---|
| committer | Karel Zak | 2017-04-28 11:19:59 +0200 |
| commit | a8771daefecf8201cdb96e493e61b048d783842c (patch) | |
| tree | 9ac79386a1a2a94bb6d864cd7553492b30e2b745 /tests/ts/libmount | |
| parent | libmount: add read-only warning (diff) | |
| download | kernel-qcow2-util-linux-a8771daefecf8201cdb96e493e61b048d783842c.tar.gz kernel-qcow2-util-linux-a8771daefecf8201cdb96e493e61b048d783842c.tar.xz kernel-qcow2-util-linux-a8771daefecf8201cdb96e493e61b048d783842c.zip | |
tests: update libmount outputs
Signed-off-by: Karel Zak <kzak@redhat.com>
Diffstat (limited to 'tests/ts/libmount')
| -rwxr-xr-x | tests/ts/libmount/loop | 9 | ||||
| -rwxr-xr-x | tests/ts/libmount/loop-overlay | 10 |
2 files changed, 12 insertions, 7 deletions
diff --git a/tests/ts/libmount/loop b/tests/ts/libmount/loop index 1589af1ed..ec22c9a2c 100755 --- a/tests/ts/libmount/loop +++ b/tests/ts/libmount/loop @@ -104,7 +104,8 @@ ts_finalize_subtest ts_init_subtest "conflict" [ -d "$TS_MOUNTPOINT" ] || mkdir -p $TS_MOUNTPOINT LODEV=$( $TS_CMD_LOSETUP --find --nooverlap --show --offset=1000 "$BACKFILE" 2>> $TS_OUTPUT ) -$TS_CMD_MOUNT "$BACKFILE" "$TS_MOUNTPOINT" 2>&1 | sed 's/^.*\.img//' > $TS_OUTPUT +$TS_CMD_MOUNT "$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" @@ -114,7 +115,8 @@ ts_init_subtest "o-loop-val-initialized" [ -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/^.*\.img//' > $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" @@ -125,7 +127,8 @@ ts_init_subtest "o-loop-val-conflict" 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/^.*\.img//' > $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 diff --git a/tests/ts/libmount/loop-overlay b/tests/ts/libmount/loop-overlay index 97eb32118..dc9b73d6b 100755 --- a/tests/ts/libmount/loop-overlay +++ b/tests/ts/libmount/loop-overlay @@ -43,8 +43,8 @@ dd if="$IMG" of="$IMG" oflag=append bs=5MiB count=1 conv=notrunc &>/dev/null echo "second should fail" >>$TS_OUTPUT $TS_CMD_MOUNT -oloop "$IMG" "$TS_MOUNTPOINT-1" >> $TS_OUTPUT 2>&1 -$TS_CMD_MOUNT -oloop,offset=$OFFSET "$IMG" "$TS_MOUNTPOINT-2" 2>&1 | sed 's/.*://' >>$TS_OUTPUT - +$TS_CMD_MOUNT -oloop,offset=$OFFSET "$IMG" "$TS_MOUNTPOINT-2" 2>&1 \ + | sed 's/:.*:/: <target>/; s/for .*/for <source>/' >> $TS_OUTPUT $TS_CMD_UMOUNT "$TS_MOUNTPOINT-1" >> $TS_OUTPUT 2>&1 echo "should succeed" >>$TS_OUTPUT @@ -56,8 +56,10 @@ $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" -$TS_CMD_MOUNT -oloop,sizelimit=$OFFSET "$IMG" "$TS_MOUNTPOINT-1" 2>&1 | sed 's/.*://' >>$TS_OUTPUT -$TS_CMD_MOUNT -oloop,offset=$OFFSET "$IMG" "$TS_MOUNTPOINT-2" 2>&1 | sed 's/.*://' >>$TS_OUTPUT +$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 \ + | sed 's/:.*:/: <target>/; s/for .*/for <source>/' >> $TS_OUTPUT $TS_CMD_LOSETUP --detach $LOOPDEV ts_log "Success" |