tests: be explicit with file permissions for cramfs

Signed-off-by: Karel Zak <kzak@redhat.com>

diff --git a/tests/ts/cramfs/mkfs b/tests/ts/cramfs/mkfs
index 19651767cfc11e5d51fa6f319303b2c7e9b55b64..90630ebf7c0ad187984066c5b60b506e31c99c17 100755 (executable)
--- a/tests/ts/cramfs/mkfs
+++ b/tests/ts/cramfs/mkfs
@@ -24,6 +24,7 @@ ts_init "$*"
 ts_check_test_command "$TS_CMD_MKCRAMFS"
 ts_check_test_command "$TS_CMD_MOUNT"
 ts_check_test_command "$TS_CMD_UMOUNT"
+ts_check_test_command "$TS_CMD_BLKID"
 ts_check_test_command "$TS_HELPER_MD5"
 ts_check_test_command "$TS_HELPER_SYSINFO"
 
@@ -58,16 +59,21 @@ ts_log "create mountpoint dir"
 
 ts_log "generate data"
 rm -rf "$IMAGE_SRC"
-mkdir -p $IMAGE_SRC
+mkdir -m 755 -p $IMAGE_SRC
+
+umask 133
+
 for d in `seq 0 110`; do
        DIRNAME="$IMAGE_SRC/$(printf "dir-%03d" $d)"
-       mkdir -p $DIRNAME
+       mkdir -m 755 $DIRNAME
        for f in `seq 0 10`; do
                FILENAME="$DIRNAME/$(printf "data.%03d" $f)"
                printf "data in %03d-%03d" $d $f >> $FILENAME
        done
 done
 
+chgrp -R 0 "$IMAGE_SRC"
+
 ts_cd "$IMAGE_SRC"
 
 ts_log "list checksums from original data"

diff --git a/tests/ts/cramfs/mkfs-endianness b/tests/ts/cramfs/mkfs-endianness
index e3913d65ebf0b7f7390394adb4be7a96f08433b2..4f6a816f624cc24fc9616961d287635cd78099a7 100755 (executable)
--- a/tests/ts/cramfs/mkfs-endianness
+++ b/tests/ts/cramfs/mkfs-endianness
@@ -29,6 +29,8 @@ ts_skip_nonroot
 IMAGE_DATA="$TS_OUTDIR/${TS_TESTNAME}-data"
 IMAGE_CREATED="$TS_OUTDIR/${TS_TESTNAME}-cramfs.img"   #Image created during the test and compared against the known images.
 
+umask 133
+
 test_image() {
        local TO_ENDIANNESS="$1"; shift
        ts_log "create $TO_ENDIANNESS endian"
@@ -43,11 +45,16 @@ test_image() {
 
 #generate test data, must be owner root
 rm -rf "$IMAGE_DATA"
-mkdir -p $IMAGE_DATA/dirA/dirB
+
+mkdir -m 755 $IMAGE_DATA
+mkdir -m 755 $IMAGE_DATA/dirA
+mkdir -m 755 $IMAGE_DATA/dirA/dirB
+
 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