diff options
| author | Ruediger Meier | 2016-03-03 13:54:17 +0100 |
|---|---|---|
| committer | Ruediger Meier | 2016-03-07 23:30:34 +0100 |
| commit | 91aced978b15595811d05bb7f1a3d518025b5740 (patch) | |
| tree | 7bcc3165227199d67e4db01affdd4dfcd4253dd7 /tests/ts/cramfs | |
| parent | libmount: don't include libio.h (diff) | |
| download | kernel-qcow2-util-linux-91aced978b15595811d05bb7f1a3d518025b5740.tar.gz kernel-qcow2-util-linux-91aced978b15595811d05bb7f1a3d518025b5740.tar.xz kernel-qcow2-util-linux-91aced978b15595811d05bb7f1a3d518025b5740.zip | |
tests: cramfs, fix root group
Sudo may login as group wheel or may use user's original group.
Note that group 0 is not named "root" on all Unix systems.
We have some more tests with similar issues but they are Linux-only
(losetup, scsi_debug). We don't fix them unless somebody complains.
BTW we use hexdump instead of md5sum.
Signed-off-by: Ruediger Meier <ruediger.meier@ga-group.nl>
Diffstat (limited to 'tests/ts/cramfs')
| -rwxr-xr-x | tests/ts/cramfs/mkfs | 19 | ||||
| -rwxr-xr-x | tests/ts/cramfs/mkfs-endianness | 5 |
2 files changed, 13 insertions, 11 deletions
diff --git a/tests/ts/cramfs/mkfs b/tests/ts/cramfs/mkfs index 07f703f67..cf6bcd699 100755 --- a/tests/ts/cramfs/mkfs +++ b/tests/ts/cramfs/mkfs @@ -51,17 +51,16 @@ ts_log "create mountpoint dir" [ -d "$TS_MOUNTPOINT" ] || mkdir -p $TS_MOUNTPOINT ts_log "generate data" -if [ ! -d "$IMAGE_SRC" ]; then - mkdir -p $IMAGE_SRC - for d in `seq 0 110`; do - DIRNAME="$IMAGE_SRC/$(printf "dir-%03d" $d)" - mkdir -p $DIRNAME - for f in `seq 0 10`; do - FILENAME="$DIRNAME/$(printf "data.%03d" $f)" - printf "data in %03d-%03d" $d $f >> $FILENAME - done +rm -rf "$IMAGE_SRC" +mkdir -p $IMAGE_SRC +for d in `seq 0 110`; do + DIRNAME="$IMAGE_SRC/$(printf "dir-%03d" $d)" + mkdir -p $DIRNAME + for f in `seq 0 10`; do + FILENAME="$DIRNAME/$(printf "data.%03d" $f)" + printf "data in %03d-%03d" $d $f >> $FILENAME done -fi +done ts_cd "$IMAGE_SRC" diff --git a/tests/ts/cramfs/mkfs-endianness b/tests/ts/cramfs/mkfs-endianness index e6707ca66..c5110867e 100755 --- a/tests/ts/cramfs/mkfs-endianness +++ b/tests/ts/cramfs/mkfs-endianness @@ -22,6 +22,7 @@ TS_DESC="mkfs endianness" ts_init "$*" ts_check_test_command "$TS_CMD_MKCRAMFS" +ts_check_test_command "$TS_CMD_HEXDUMP" ts_skip_nonroot @@ -35,7 +36,7 @@ test_image() { $TS_CMD_MKCRAMFS -N "$TO_ENDIANNESS" -b 4096 "$IMAGE_DATA" \ "$IMAGE_CREATED" >> $TS_OUTPUT 2>&1 - md5sum $IMAGE_CREATED | cut -d" " -f1 >> $TS_OUTPUT + $TS_CMD_HEXDUMP -C $IMAGE_CREATED >> $TS_OUTPUT rm "$IMAGE_CREATED" } @@ -47,6 +48,8 @@ yes "Testing cramfs 1234567890 Endianness check 1234567890 Endianness check" \ | dd of=$IMAGE_DATA/dirA/dirB/a bs=512 count=1 &> /dev/null yes "Testing cramfs 1234567890 Endianness check 1234567890 Endianness check" \ | dd of=$IMAGE_DATA/dirA/dirB/b bs=512 count=30 &> /dev/null +# sudo may use whatever group +chgrp -R 0 $IMAGE_DATA #perform tests for both endians test_image "little" |