diff options
| -rw-r--r-- | tests/expected/losetup/losetup-blkdev-offset | 1 | ||||
| -rw-r--r-- | tests/expected/losetup/losetup-blkdev-section | 1 | ||||
| -rw-r--r-- | tests/expected/losetup/losetup-blkdev-show | 1 | ||||
| -rw-r--r-- | tests/expected/losetup/losetup-blkdev-sizelimit | 1 | ||||
| -rw-r--r-- | tests/expected/losetup/losetup-file-offset | 1 | ||||
| -rw-r--r-- | tests/expected/losetup/losetup-file-section | 1 | ||||
| -rw-r--r-- | tests/expected/losetup/losetup-file-secton | 3 | ||||
| -rw-r--r-- | tests/expected/losetup/losetup-file-show | 1 | ||||
| -rw-r--r-- | tests/expected/losetup/losetup-file-sizelimit | 1 | ||||
| -rw-r--r-- | tests/expected/losetup/losetup-file-type | 4 | ||||
| -rwxr-xr-x | tests/ts/losetup/losetup | 8 | ||||
| -rw-r--r-- | tests/ts/losetup/losetup_functions.sh | 1 |
12 files changed, 21 insertions, 3 deletions
diff --git a/tests/expected/losetup/losetup-blkdev-offset b/tests/expected/losetup/losetup-blkdev-offset index 7b37b6fb0..496392386 100644 --- a/tests/expected/losetup/losetup-blkdev-offset +++ b/tests/expected/losetup/losetup-blkdev-offset @@ -1,3 +1,4 @@ offset: 1048576 sizelimit: 0 size: 10485760 +type: RAW diff --git a/tests/expected/losetup/losetup-blkdev-section b/tests/expected/losetup/losetup-blkdev-section index b480d6654..379bef3af 100644 --- a/tests/expected/losetup/losetup-blkdev-section +++ b/tests/expected/losetup/losetup-blkdev-section @@ -1,3 +1,4 @@ offset: 1048576 sizelimit: 3145728 size: 3145728 +type: RAW diff --git a/tests/expected/losetup/losetup-blkdev-show b/tests/expected/losetup/losetup-blkdev-show index 2afc15105..245e096be 100644 --- a/tests/expected/losetup/losetup-blkdev-show +++ b/tests/expected/losetup/losetup-blkdev-show @@ -1,3 +1,4 @@ offset: 0 sizelimit: 0 size: 11534336 +type: RAW diff --git a/tests/expected/losetup/losetup-blkdev-sizelimit b/tests/expected/losetup/losetup-blkdev-sizelimit index d220d48da..7e2ed601d 100644 --- a/tests/expected/losetup/losetup-blkdev-sizelimit +++ b/tests/expected/losetup/losetup-blkdev-sizelimit @@ -1,3 +1,4 @@ offset: 0 sizelimit: 3145728 size: 3145728 +type: RAW diff --git a/tests/expected/losetup/losetup-file-offset b/tests/expected/losetup/losetup-file-offset index b416f8e01..4a1ab54e7 100644 --- a/tests/expected/losetup/losetup-file-offset +++ b/tests/expected/losetup/losetup-file-offset @@ -1,3 +1,4 @@ offset: 1048576 sizelimit: 0 size: 9437184 +type: RAW diff --git a/tests/expected/losetup/losetup-file-section b/tests/expected/losetup/losetup-file-section index b480d6654..379bef3af 100644 --- a/tests/expected/losetup/losetup-file-section +++ b/tests/expected/losetup/losetup-file-section @@ -1,3 +1,4 @@ offset: 1048576 sizelimit: 3145728 size: 3145728 +type: RAW diff --git a/tests/expected/losetup/losetup-file-secton b/tests/expected/losetup/losetup-file-secton deleted file mode 100644 index b480d6654..000000000 --- a/tests/expected/losetup/losetup-file-secton +++ /dev/null @@ -1,3 +0,0 @@ -offset: 1048576 -sizelimit: 3145728 -size: 3145728 diff --git a/tests/expected/losetup/losetup-file-show b/tests/expected/losetup/losetup-file-show index 09d11473f..063a12646 100644 --- a/tests/expected/losetup/losetup-file-show +++ b/tests/expected/losetup/losetup-file-show @@ -1,3 +1,4 @@ offset: 0 sizelimit: 0 size: 10485760 +type: RAW diff --git a/tests/expected/losetup/losetup-file-sizelimit b/tests/expected/losetup/losetup-file-sizelimit index d220d48da..7e2ed601d 100644 --- a/tests/expected/losetup/losetup-file-sizelimit +++ b/tests/expected/losetup/losetup-file-sizelimit @@ -1,3 +1,4 @@ offset: 0 sizelimit: 3145728 size: 3145728 +type: RAW diff --git a/tests/expected/losetup/losetup-file-type b/tests/expected/losetup/losetup-file-type new file mode 100644 index 000000000..063a12646 --- /dev/null +++ b/tests/expected/losetup/losetup-file-type @@ -0,0 +1,4 @@ +offset: 0 +sizelimit: 0 +size: 10485760 +type: RAW diff --git a/tests/ts/losetup/losetup b/tests/ts/losetup/losetup index 1fec0dd06..42eb1d78c 100755 --- a/tests/ts/losetup/losetup +++ b/tests/ts/losetup/losetup @@ -69,6 +69,14 @@ lo_print $LODEV >> $TS_OUTPUT $TS_CMD_LOSETUP -d $LODEV ts_finalize_subtest +ts_init_subtest "file-type" +LODEV=$( $TS_CMD_LOSETUP --type RAW --find --show $BACKFILE ) +if [ -z "$LODEV" ]; then + ts_log "Failed to create loop device" +fi +lo_print $LODEV >> $TS_OUTPUT +$TS_CMD_LOSETUP -d $LODEV +ts_finalize_subtest ts_init_subtest "file-section" LODEV=$( $TS_CMD_LOSETUP --offset 1MiB --sizelimit 3MiB --find --show $BACKFILE ) diff --git a/tests/ts/losetup/losetup_functions.sh b/tests/ts/losetup/losetup_functions.sh index d17c82a30..875b53e94 100644 --- a/tests/ts/losetup/losetup_functions.sh +++ b/tests/ts/losetup/losetup_functions.sh @@ -4,4 +4,5 @@ function lo_print { echo "offset: $( $TS_CMD_LOSETUP --list --raw -n -O OFFSET $lo )" echo "sizelimit: $( $TS_CMD_LOSETUP --list --raw -n -O SIZELIMIT $lo )" echo "size: $( $TS_CMD_LSBLK -o SIZE -b -n -r $lo )" + echo "type: $( $TS_CMD_LOSETUP --list --raw -n -O FILE-FORMAT $lo )" } |