diff options
author | Karel Zak | 2017-11-23 13:44:53 +0100 |
---|---|---|
committer | Karel Zak | 2017-11-23 13:44:53 +0100 |
commit | 02ae505fd40a5ca8ab106dfec9a1b6c901bf31b7 (patch) | |
tree | 5492d4743b4d1ee8bcc8729bd4a7de9cbad596b2 /tests/ts/libmount | |
parent | hwclock: revert ioctl test (diff) | |
download | kernel-qcow2-util-linux-02ae505fd40a5ca8ab106dfec9a1b6c901bf31b7.tar.gz kernel-qcow2-util-linux-02ae505fd40a5ca8ab106dfec9a1b6c901bf31b7.tar.xz kernel-qcow2-util-linux-02ae505fd40a5ca8ab106dfec9a1b6c901bf31b7.zip |
tests: rename ts_valgrind to ts_run
Let's make our tests more generic, so we can later hide more stuff
into ts_run call.
Signed-off-by: Karel Zak <kzak@redhat.com>
Diffstat (limited to 'tests/ts/libmount')
-rwxr-xr-x | tests/ts/libmount/context | 22 | ||||
-rwxr-xr-x | tests/ts/libmount/context-utab | 12 | ||||
-rwxr-xr-x | tests/ts/libmount/debug | 6 | ||||
-rwxr-xr-x | tests/ts/libmount/lock | 2 | ||||
-rwxr-xr-x | tests/ts/libmount/optstr | 54 | ||||
-rwxr-xr-x | tests/ts/libmount/tabdiff | 8 | ||||
-rwxr-xr-x | tests/ts/libmount/tabfiles | 22 | ||||
-rwxr-xr-x | tests/ts/libmount/tabfiles-tags | 12 | ||||
-rwxr-xr-x | tests/ts/libmount/update | 46 | ||||
-rwxr-xr-x | tests/ts/libmount/utils | 36 |
10 files changed, 110 insertions, 110 deletions
diff --git a/tests/ts/libmount/context b/tests/ts/libmount/context index 1bd42dc5f..3b49801d4 100755 --- a/tests/ts/libmount/context +++ b/tests/ts/libmount/context @@ -83,49 +83,49 @@ ts_device_has "TYPE" "ext4" $DEVICE || ts_die "Cannot find ext3 on $DEVICE" ts_init_subtest "mount-by-devname" mkdir -p $MOUNTPOINT &> /dev/null -ts_valgrind $TESTPROG --mount $DEVICE $MOUNTPOINT >> $TS_OUTPUT 2>&1 +ts_run $TESTPROG --mount $DEVICE $MOUNTPOINT >> $TS_OUTPUT 2>&1 is_mounted $DEVICE || echo "$DEVICE not mounted" >> $TS_OUTPUT 2>&1 ts_finalize_subtest ts_init_subtest "umount-by-devname" -ts_valgrind $TESTPROG --umount $DEVICE >> $TS_OUTPUT 2>&1 +ts_run $TESTPROG --umount $DEVICE >> $TS_OUTPUT 2>&1 is_mounted $DEVICE && echo "$DEVICE still mounted" >> $TS_OUTPUT 2>&1 ts_finalize_subtest ts_init_subtest "mount-by-label" mkdir -p $MOUNTPOINT &> /dev/null -ts_valgrind $TESTPROG --mount LABEL="$LABEL" $MOUNTPOINT >> $TS_OUTPUT 2>&1 +ts_run $TESTPROG --mount LABEL="$LABEL" $MOUNTPOINT >> $TS_OUTPUT 2>&1 is_mounted $DEVICE || echo "$DEVICE not mounted" >> $TS_OUTPUT 2>&1 ts_finalize_subtest ts_init_subtest "umount-by-mountpoint" -ts_valgrind $TESTPROG --umount $MOUNTPOINT >> $TS_OUTPUT 2>&1 +ts_run $TESTPROG --umount $MOUNTPOINT >> $TS_OUTPUT 2>&1 is_mounted $DEVICE && echo "$DEVICE still mounted" >> $TS_OUTPUT 2>&1 ts_finalize_subtest ts_init_subtest "mount-by-uuid" mkdir -p $MOUNTPOINT &> /dev/null -ts_valgrind $TESTPROG --mount UUID="$UUID" $MOUNTPOINT >> $TS_OUTPUT 2>&1 +ts_run $TESTPROG --mount UUID="$UUID" $MOUNTPOINT >> $TS_OUTPUT 2>&1 is_mounted $DEVICE || echo "$DEVICE not mounted" >> $TS_OUTPUT 2>&1 -ts_valgrind $TESTPROG --umount $MOUNTPOINT >> $TS_OUTPUT 2>&1 +ts_run $TESTPROG --umount $MOUNTPOINT >> $TS_OUTPUT 2>&1 is_mounted $DEVICE && echo "$DEVICE still mounted" >> $TS_OUTPUT 2>&1 ts_finalize_subtest ts_init_subtest "mount-flags" mkdir -p $MOUNTPOINT &> /dev/null -ts_valgrind $TESTPROG --mount -o ro,noexec,nosuid,strictatime $DEVICE $MOUNTPOINT >> $TS_OUTPUT 2>&1 +ts_run $TESTPROG --mount -o ro,noexec,nosuid,strictatime $DEVICE $MOUNTPOINT >> $TS_OUTPUT 2>&1 $TS_CMD_FINDMNT --kernel --mountpoint $MOUNTPOINT -o VFS-OPTIONS -n >> $TS_OUTPUT 2>&1 is_mounted $DEVICE || echo "$DEVICE not mounted" >> $TS_OUTPUT 2>&1 -ts_valgrind $TESTPROG --mount -o remount,rw $MOUNTPOINT >> $TS_OUTPUT 2>&1 +ts_run $TESTPROG --mount -o remount,rw $MOUNTPOINT >> $TS_OUTPUT 2>&1 $TS_CMD_FINDMNT --kernel --mountpoint $MOUNTPOINT -o VFS-OPTIONS -n >> $TS_OUTPUT 2>&1 -ts_valgrind $TESTPROG --umount $MOUNTPOINT >> $TS_OUTPUT 2>&1 +ts_run $TESTPROG --umount $MOUNTPOINT >> $TS_OUTPUT 2>&1 is_mounted $DEVICE && echo "$DEVICE still mounted" >> $TS_OUTPUT 2>&1 ts_finalize_subtest @@ -136,10 +136,10 @@ img=$(ts_image_init) mkfs.ext3 -F $img &> /dev/null udevadm settle -ts_valgrind $TESTPROG --mount -o loop $img $MOUNTPOINT >> $TS_OUTPUT 2>&1 +ts_run $TESTPROG --mount -o loop $img $MOUNTPOINT >> $TS_OUTPUT 2>&1 is_mounted $MOUNTPOINT || echo "$MOUNTPOINT not mounted" >> $TS_OUTPUT 2>&1 udevadm settle -ts_valgrind $TESTPROG --umount $MOUNTPOINT >> $TS_OUTPUT 2>&1 +ts_run $TESTPROG --umount $MOUNTPOINT >> $TS_OUTPUT 2>&1 is_mounted $MOUNTPOINT && echo "$MOUNTPOINT still mounted" >> $TS_OUTPUT 2>&1 ts_finalize_subtest diff --git a/tests/ts/libmount/context-utab b/tests/ts/libmount/context-utab index f8a21e010..24d528d87 100755 --- a/tests/ts/libmount/context-utab +++ b/tests/ts/libmount/context-utab @@ -66,14 +66,14 @@ udevadm settle ts_init_subtest "mount-by-devname" mkdir -p $MOUNTPOINT &> /dev/null -ts_valgrind $TESTPROG --mount $DEVICE $MOUNTPOINT >> $TS_OUTPUT 2>&1 +ts_run $TESTPROG --mount $DEVICE $MOUNTPOINT >> $TS_OUTPUT 2>&1 grep -q $DEVICE /proc/mounts || \ echo "(by device) cannot find $DEVICE in /proc/mounts" >> $TS_OUTPUT 2>&1 ts_finalize_subtest ts_init_subtest "umount-by-devname" -ts_valgrind $TESTPROG --umount $DEVICE >> $TS_OUTPUT 2>&1 +ts_run $TESTPROG --umount $DEVICE >> $TS_OUTPUT 2>&1 grep -q $DEVICE /proc/mounts && echo "umount (device) failed: found $DEVICE in /proc/mounts" >> $TS_OUTPUT 2>&1 ts_finalize_subtest @@ -81,14 +81,14 @@ ts_finalize_subtest ts_init_subtest "mount-uhelper" mkdir -p $MOUNTPOINT &> /dev/null -ts_valgrind $TESTPROG --mount -o uhelper=foo,rw LABEL="$LABEL" $MOUNTPOINT >> $TS_OUTPUT 2>&1 +ts_run $TESTPROG --mount -o uhelper=foo,rw LABEL="$LABEL" $MOUNTPOINT >> $TS_OUTPUT 2>&1 grep -q $DEVICE $LIBMOUNT_UTAB || \ echo "(by label) cannot find $DEVICE in $LIBMOUNT_UTAB" >> $TS_OUTPUT 2>&1 ts_finalize_subtest ts_init_subtest "umount" -ts_valgrind $TESTPROG --umount $MOUNTPOINT >> $TS_OUTPUT 2>&1 +ts_run $TESTPROG --umount $MOUNTPOINT >> $TS_OUTPUT 2>&1 grep -q $DEVICE $LIBMOUNT_UTAB && \ echo "umount (mountpoint) failed: found $DEVICE in $LIBMOUNT_UTAB" >> $TS_OUTPUT 2>&1 ts_finalize_subtest @@ -108,7 +108,7 @@ if type "mkfs.btrfs" &>/dev/null && mkfs.btrfs --version &>/dev/null; then ts_init_subtest "mount-uhelper-subvol" mkdir -p $MOUNTPOINT &> /dev/null - ts_valgrind $TESTPROG --mount -o uhelper=foo,rw,subvol=sub $DEVICE $MOUNTPOINT >> $TS_OUTPUT 2>&1 + ts_run $TESTPROG --mount -o uhelper=foo,rw,subvol=sub $DEVICE $MOUNTPOINT >> $TS_OUTPUT 2>&1 grep -q $DEVICE $LIBMOUNT_UTAB || \ echo "cannot find $DEVICE in $LIBMOUNT_UTAB" >> $TS_OUTPUT 2>&1 ts_finalize_subtest @@ -122,7 +122,7 @@ if type "mkfs.btrfs" &>/dev/null && mkfs.btrfs --version &>/dev/null; then #ts_log "---" ts_init_subtest "umount-subvol" - ts_valgrind $TESTPROG --umount $MOUNTPOINT >> $TS_OUTPUT 2>&1 + ts_run $TESTPROG --umount $MOUNTPOINT >> $TS_OUTPUT 2>&1 grep -q $DEVICE $LIBMOUNT_UTAB && \ echo "umount (mountpoint) failed: found $DEVICE in $LIBMOUNT_UTAB" >> $TS_OUTPUT 2>&1 ts_finalize_subtest diff --git a/tests/ts/libmount/debug b/tests/ts/libmount/debug index d722b4e21..5507d54d1 100755 --- a/tests/ts/libmount/debug +++ b/tests/ts/libmount/debug @@ -14,17 +14,17 @@ TESTPROG="$TS_HELPER_LIBMOUNT_DEBUG" # CACHE | LOCKS ts_init_subtest "set-from-code" -ts_valgrind $TESTPROG 20 2>&1 | grep -o '0x.*' &> $TS_OUTPUT +ts_run $TESTPROG 20 2>&1 | grep -o '0x.*' &> $TS_OUTPUT ts_finalize_subtest # CACHE | LOCKS ts_init_subtest "set-from-env-str" -LIBMOUNT_DEBUG=cache,locks ts_valgrind $TESTPROG 2>&1 | grep -o '0x.*' &> $TS_OUTPUT +LIBMOUNT_DEBUG=cache,locks ts_run $TESTPROG 2>&1 | grep -o '0x.*' &> $TS_OUTPUT ts_finalize_subtest # CACHE | LOCKS ts_init_subtest "set-from-env-int" -LIBMOUNT_DEBUG=20 ts_valgrind $TESTPROG 2>&1 | grep -o '0x.*' &> $TS_OUTPUT +LIBMOUNT_DEBUG=20 ts_run $TESTPROG 2>&1 | grep -o '0x.*' &> $TS_OUTPUT ts_finalize_subtest ts_finalize diff --git a/tests/ts/libmount/lock b/tests/ts/libmount/lock index f8caeb506..816612484 100755 --- a/tests/ts/libmount/lock +++ b/tests/ts/libmount/lock @@ -33,7 +33,7 @@ echo 0 > $TS_OUTPUT SYNCTIME=$(( $(date +%s) + 5 )) for id in $(seq 0 $(( $NPROCESSES - 1 ))); do - ts_valgrind $TESTPROG --lock --synctime $SYNCTIME $TS_OUTPUT $NLOOPS >> $TS_OUTPUT.debug 2>&1 & + ts_run $TESTPROG --lock --synctime $SYNCTIME $TS_OUTPUT $NLOOPS >> $TS_OUTPUT.debug 2>&1 & done wait diff --git a/tests/ts/libmount/optstr b/tests/ts/libmount/optstr index 1fbf0641c..774fe5685 100755 --- a/tests/ts/libmount/optstr +++ b/tests/ts/libmount/optstr @@ -13,111 +13,111 @@ TESTPROG="$TS_HELPER_LIBMOUNT_OPTSTR" [ -x $TESTPROG ] || ts_skip "test not compiled" ts_init_subtest "append" -ts_valgrind $TESTPROG --append "aaa,bbb=BBB,context=\"foo,bar,gogo\",ccc" "ddd" &> $TS_OUTPUT +ts_run $TESTPROG --append "aaa,bbb=BBB,context=\"foo,bar,gogo\",ccc" "ddd" &> $TS_OUTPUT ts_finalize_subtest ts_init_subtest "append-value" -ts_valgrind $TESTPROG --append "aaa,bbb=BBB,ccc" "ddd" "DDD" &> $TS_OUTPUT +ts_run $TESTPROG --append "aaa,bbb=BBB,ccc" "ddd" "DDD" &> $TS_OUTPUT ts_finalize_subtest ts_init_subtest "append-empty-value" -ts_valgrind $TESTPROG --append "aaa,bbb=BBB,ccc" "ddd" "" &> $TS_OUTPUT +ts_run $TESTPROG --append "aaa,bbb=BBB,ccc" "ddd" "" &> $TS_OUTPUT ts_finalize_subtest ts_init_subtest "prepend" -ts_valgrind $TESTPROG --prepend "aaa,bbb=BBB,ccc" "ddd" &> $TS_OUTPUT +ts_run $TESTPROG --prepend "aaa,bbb=BBB,ccc" "ddd" &> $TS_OUTPUT ts_finalize_subtest ts_init_subtest "prepend-value" -ts_valgrind $TESTPROG --prepend "aaa,bbb=BBB,ccc" "ddd" "DDD" &> $TS_OUTPUT +ts_run $TESTPROG --prepend "aaa,bbb=BBB,ccc" "ddd" "DDD" &> $TS_OUTPUT ts_finalize_subtest ts_init_subtest "prepend-empty-value" -ts_valgrind $TESTPROG --prepend "aaa,bbb=BBB,ccc" "ddd" "" &> $TS_OUTPUT +ts_run $TESTPROG --prepend "aaa,bbb=BBB,ccc" "ddd" "" &> $TS_OUTPUT ts_finalize_subtest ts_init_subtest "set-remove" -ts_valgrind $TESTPROG --set "aaa,bbb=BBB,ccc" "bbb" &> $TS_OUTPUT +ts_run $TESTPROG --set "aaa,bbb=BBB,ccc" "bbb" &> $TS_OUTPUT ts_finalize_subtest ts_init_subtest "set-small" -ts_valgrind $TESTPROG --set "aaa,bbb=BBB,ccc" "bbb" "X" &> $TS_OUTPUT +ts_run $TESTPROG --set "aaa,bbb=BBB,ccc" "bbb" "X" &> $TS_OUTPUT ts_finalize_subtest ts_init_subtest "set-large" -ts_valgrind $TESTPROG --set "aaa,bbb=BBB,ccc" "bbb" "XXX-YYY-ZZZ" &> $TS_OUTPUT +ts_run $TESTPROG --set "aaa,bbb=BBB,ccc" "bbb" "XXX-YYY-ZZZ" &> $TS_OUTPUT ts_finalize_subtest ts_init_subtest "set-empty" -ts_valgrind $TESTPROG --set "aaa,bbb=BBB,ccc" "bbb" "" &> $TS_OUTPUT +ts_run $TESTPROG --set "aaa,bbb=BBB,ccc" "bbb" "" &> $TS_OUTPUT ts_finalize_subtest ts_init_subtest "set-new" -ts_valgrind $TESTPROG --set "aaa,bbb=BBB,ccc" "aaa" "XXX" &> $TS_OUTPUT +ts_run $TESTPROG --set "aaa,bbb=BBB,ccc" "aaa" "XXX" &> $TS_OUTPUT ts_finalize_subtest ts_init_subtest "set-new-empty" -ts_valgrind $TESTPROG --set "aaa,bbb=BBB,ccc" "aaa" "" &> $TS_OUTPUT +ts_run $TESTPROG --set "aaa,bbb=BBB,ccc" "aaa" "" &> $TS_OUTPUT ts_finalize_subtest ts_init_subtest "set-new-end" -ts_valgrind $TESTPROG --set "aaa,bbb=BBB,ccc" "ccc" "XXX" &> $TS_OUTPUT +ts_run $TESTPROG --set "aaa,bbb=BBB,ccc" "ccc" "XXX" &> $TS_OUTPUT ts_finalize_subtest ts_init_subtest "set-new-end-empty" -ts_valgrind $TESTPROG --set "aaa,bbb=BBB,ccc" "ccc" "" &> $TS_OUTPUT +ts_run $TESTPROG --set "aaa,bbb=BBB,ccc" "ccc" "" &> $TS_OUTPUT ts_finalize_subtest ts_init_subtest "get" -ts_valgrind $TESTPROG --get "aaa,bbb=BBB,ccc" "aaa" &> $TS_OUTPUT +ts_run $TESTPROG --get "aaa,bbb=BBB,ccc" "aaa" &> $TS_OUTPUT ts_finalize_subtest ts_init_subtest "get-value" -ts_valgrind $TESTPROG --get "aaa,bbb=BBB,ccc" "bbb" &> $TS_OUTPUT +ts_run $TESTPROG --get "aaa,bbb=BBB,ccc" "bbb" &> $TS_OUTPUT ts_finalize_subtest ts_init_subtest "remove" -ts_valgrind $TESTPROG --remove "aaa,bbb=BBB,ccc" "aaa" &> $TS_OUTPUT +ts_run $TESTPROG --remove "aaa,bbb=BBB,ccc" "aaa" &> $TS_OUTPUT ts_finalize_subtest ts_init_subtest "remove-quoted" -ts_valgrind $TESTPROG --remove "aaa,context=\"foo,bar,gogo\",bbb=BBB,ccc" "context" &> $TS_OUTPUT +ts_run $TESTPROG --remove "aaa,context=\"foo,bar,gogo\",bbb=BBB,ccc" "context" &> $TS_OUTPUT ts_finalize_subtest ts_init_subtest "remove-value" -ts_valgrind $TESTPROG --remove "aaa,bbb=BBB,ccc" "bbb" &> $TS_OUTPUT +ts_run $TESTPROG --remove "aaa,bbb=BBB,ccc" "bbb" &> $TS_OUTPUT ts_finalize_subtest ts_init_subtest "remove-empty-value" -ts_valgrind $TESTPROG --remove "aaa,bbb=,ccc" "bbb" &> $TS_OUTPUT +ts_run $TESTPROG --remove "aaa,bbb=,ccc" "bbb" &> $TS_OUTPUT ts_finalize_subtest ts_init_subtest "split" -ts_valgrind $TESTPROG --split "aaa,bbb=BBB,ccc,x-bar,x-foo=foodata,user=kzak,noexec,nosuid,loop=/dev/loop0" &> $TS_OUTPUT +ts_run $TESTPROG --split "aaa,bbb=BBB,ccc,x-bar,x-foo=foodata,user=kzak,noexec,nosuid,loop=/dev/loop0" &> $TS_OUTPUT ts_finalize_subtest ts_init_subtest "flags" -ts_valgrind $TESTPROG --flags "aaa,bbb=BBB,x-foo,ccc,user=kzak,nodev,noexec,nosuid,loop=/dev/loop0" &> $TS_OUTPUT +ts_run $TESTPROG --flags "aaa,bbb=BBB,x-foo,ccc,user=kzak,nodev,noexec,nosuid,loop=/dev/loop0" &> $TS_OUTPUT ts_finalize_subtest ts_init_subtest "apply-linux" # add noatime and remove noexec and nosuid -ts_valgrind $TESTPROG --apply --linux "user=kzak,noexec,nosuid" 0x400 &> $TS_OUTPUT +ts_run $TESTPROG --apply --linux "user=kzak,noexec,nosuid" 0x400 &> $TS_OUTPUT ts_finalize_subtest ts_init_subtest "apply-user" # add user,nofail and remove loop -ts_valgrind $TESTPROG --apply --user "noexec,nosuid,loop=/dev/looop0" 0x408 &> $TS_OUTPUT +ts_run $TESTPROG --apply --user "noexec,nosuid,loop=/dev/looop0" 0x408 &> $TS_OUTPUT ts_finalize_subtest ts_init_subtest "fix" -ts_valgrind $TESTPROG --fix "uid=root,gid=root" &> $TS_OUTPUT +ts_run $TESTPROG --fix "uid=root,gid=root" &> $TS_OUTPUT ts_finalize_subtest ts_init_subtest "deduplicate" -ts_valgrind $TESTPROG --dedup bbb,ccc,AAA,xxx,AAA=a,AAA=bbb,ddd,AAA=ccc,fff=eee AAA &> $TS_OUTPUT +ts_run $TESTPROG --dedup bbb,ccc,AAA,xxx,AAA=a,AAA=bbb,ddd,AAA=ccc,fff=eee AAA &> $TS_OUTPUT ts_finalize_subtest ts_init_subtest "deduplicate-empty" -ts_valgrind $TESTPROG --dedup bbb,ccc,AAA,xxx,AAA=a,AAA=bbb,ddd,AAA=,fff=eee AAA &> $TS_OUTPUT +ts_run $TESTPROG --dedup bbb,ccc,AAA,xxx,AAA=a,AAA=bbb,ddd,AAA=,fff=eee AAA &> $TS_OUTPUT ts_finalize_subtest ts_finalize diff --git a/tests/ts/libmount/tabdiff b/tests/ts/libmount/tabdiff index 80753ea2a..344daaee7 100755 --- a/tests/ts/libmount/tabdiff +++ b/tests/ts/libmount/tabdiff @@ -13,19 +13,19 @@ TESTPROG="$TS_HELPER_LIBMOUNT_TABDIFF" [ -x $TESTPROG ] || ts_skip "test not compiled" ts_init_subtest "mount" -ts_valgrind $TESTPROG --diff $TS_SELF/files/mountinfo_u $TS_SELF/files/mountinfo &> $TS_OUTPUT +ts_run $TESTPROG --diff $TS_SELF/files/mountinfo_u $TS_SELF/files/mountinfo &> $TS_OUTPUT ts_finalize_subtest ts_init_subtest "umount" -ts_valgrind $TESTPROG --diff $TS_SELF/files/mountinfo $TS_SELF/files/mountinfo_u &> $TS_OUTPUT +ts_run $TESTPROG --diff $TS_SELF/files/mountinfo $TS_SELF/files/mountinfo_u &> $TS_OUTPUT ts_finalize_subtest ts_init_subtest "remount" -ts_valgrind $TESTPROG --diff $TS_SELF/files/mountinfo $TS_SELF/files/mountinfo_re &> $TS_OUTPUT +ts_run $TESTPROG --diff $TS_SELF/files/mountinfo $TS_SELF/files/mountinfo_re &> $TS_OUTPUT ts_finalize_subtest ts_init_subtest "move" -ts_valgrind $TESTPROG --diff $TS_SELF/files/mountinfo $TS_SELF/files/mountinfo_mv &> $TS_OUTPUT +ts_run $TESTPROG --diff $TS_SELF/files/mountinfo $TS_SELF/files/mountinfo_mv &> $TS_OUTPUT ts_finalize_subtest ts_finalize diff --git a/tests/ts/libmount/tabfiles b/tests/ts/libmount/tabfiles index a60c03894..ba424b24d 100755 --- a/tests/ts/libmount/tabfiles +++ b/tests/ts/libmount/tabfiles @@ -13,57 +13,57 @@ TESTPROG="$TS_HELPER_LIBMOUNT_TAB" [ -x $TESTPROG ] || ts_skip "test not compiled" ts_init_subtest "parse-fstab" -ts_valgrind $TESTPROG --parse "$TS_SELF/files/fstab" &> $TS_OUTPUT +ts_run $TESTPROG --parse "$TS_SELF/files/fstab" &> $TS_OUTPUT sed -i -e 's/fs: 0x.*/fs:/g' $TS_OUTPUT ts_finalize_subtest ts_init_subtest "parse-fstab-full" -ts_valgrind $TESTPROG --parse "$TS_SELF/files/fstab.comment" --comments &> $TS_OUTPUT +ts_run $TESTPROG --parse "$TS_SELF/files/fstab.comment" --comments &> $TS_OUTPUT sed -i -e 's/fs: 0x.*/fs:/g' $TS_OUTPUT ts_finalize_subtest ts_init_subtest "parse-mtab" -ts_valgrind $TESTPROG --parse "$TS_SELF/files/mtab" &> $TS_OUTPUT +ts_run $TESTPROG --parse "$TS_SELF/files/mtab" &> $TS_OUTPUT sed -i -e 's/fs: 0x.*/fs:/g' $TS_OUTPUT ts_finalize_subtest ts_init_subtest "parse-fstab-broken" -ts_valgrind $TESTPROG --parse "$TS_SELF/files/fstab.broken" &> $TS_OUTPUT +ts_run $TESTPROG --parse "$TS_SELF/files/fstab.broken" &> $TS_OUTPUT sed -i -e 's/.*fstab.broken:[[:digit:]]*: parse error//g; s/fs: 0x.*/fs:/g' $TS_OUTPUT ts_finalize_subtest ts_init_subtest "parse-mountinfo" -ts_valgrind $TESTPROG --parse "$TS_SELF/files/mountinfo" &> $TS_OUTPUT +ts_run $TESTPROG --parse "$TS_SELF/files/mountinfo" &> $TS_OUTPUT sed -i -e 's/fs: 0x.*/fs:/g' $TS_OUTPUT ts_finalize_subtest ts_init_subtest "copy" -ts_valgrind $TESTPROG --copy-fs "$TS_SELF/files/fstab" &> $TS_OUTPUT +ts_run $TESTPROG --copy-fs "$TS_SELF/files/fstab" &> $TS_OUTPUT sed -i -e 's/fs: 0x.*/fs:/g' $TS_OUTPUT ts_finalize_subtest ts_init_subtest "find-source" -ts_valgrind $TESTPROG --find-forward "$TS_SELF/files/fstab" source UUID=fef7ccb3-821c-4de8-88dc-71472be5946f &> $TS_OUTPUT +ts_run $TESTPROG --find-forward "$TS_SELF/files/fstab" source UUID=fef7ccb3-821c-4de8-88dc-71472be5946f &> $TS_OUTPUT sed -i -e 's/fs: 0x.*/fs:/g' $TS_OUTPUT ts_finalize_subtest ts_init_subtest "find-target" -ts_valgrind $TESTPROG --find-forward "$TS_SELF/files/fstab" target /home/foo &> $TS_OUTPUT +ts_run $TESTPROG --find-forward "$TS_SELF/files/fstab" target /home/foo &> $TS_OUTPUT sed -i -e 's/fs: 0x.*/fs:/g' $TS_OUTPUT ts_finalize_subtest ts_init_subtest "find-target2" -ts_valgrind $TESTPROG --find-forward "$TS_SELF/files/fstab" target /any/foo &> $TS_OUTPUT +ts_run $TESTPROG --find-forward "$TS_SELF/files/fstab" target /any/foo &> $TS_OUTPUT sed -i -e 's/fs: 0x.*/fs:/g' $TS_OUTPUT ts_finalize_subtest ts_init_subtest "find-target3" -ts_valgrind $TESTPROG --find-forward "$TS_SELF/files/fstab" target /any/foo/ &> $TS_OUTPUT +ts_run $TESTPROG --find-forward "$TS_SELF/files/fstab" target /any/foo/ &> $TS_OUTPUT sed -i -e 's/fs: 0x.*/fs:/g' $TS_OUTPUT ts_finalize_subtest ts_init_subtest "find-pair" -ts_valgrind $TESTPROG --find-pair "$TS_SELF/files/mtab" /dev/mapper/kzak-home /home/kzak &> $TS_OUTPUT +ts_run $TESTPROG --find-pair "$TS_SELF/files/mtab" /dev/mapper/kzak-home /home/kzak &> $TS_OUTPUT sed -i -e 's/fs: 0x.*/fs:/g' $TS_OUTPUT ts_finalize_subtest diff --git a/tests/ts/libmount/tabfiles-tags b/tests/ts/libmount/tabfiles-tags index f986dbc37..4933876d4 100755 --- a/tests/ts/libmount/tabfiles-tags +++ b/tests/ts/libmount/tabfiles-tags @@ -38,12 +38,12 @@ FSTAB="$TS_OUTDIR/fstab" echo "LABEL=$LABEL /mnt/mountpoint auto defaults" > $FSTAB ts_init_subtest "fstab-label2uuid" -ts_valgrind $TESTPROG --find-forward $FSTAB source "UUID=$UUID" &> $TS_OUTPUT +ts_run $TESTPROG --find-forward $FSTAB source "UUID=$UUID" &> $TS_OUTPUT sed -i -e 's/fs: 0x.*/fs:/g' $TS_OUTPUT ts_finalize_subtest ts_init_subtest "fstab-label2dev" -ts_valgrind $TESTPROG --find-forward $FSTAB source $TS_DEVICE &> $TS_OUTPUT +ts_run $TESTPROG --find-forward $FSTAB source $TS_DEVICE &> $TS_OUTPUT sed -i -e 's/fs: 0x.*/fs:/g' $TS_OUTPUT ts_finalize_subtest @@ -54,20 +54,20 @@ echo "UUID=$UUID /mnt/mountpoint2 auto defaults" >> $FSTAB ts_init_subtest "fstab-uuid" # has to return /mnt/mountpoint2 -ts_valgrind $TESTPROG --find-forward $FSTAB source "UUID=$UUID" &> $TS_OUTPUT +ts_run $TESTPROG --find-forward $FSTAB source "UUID=$UUID" &> $TS_OUTPUT sed -i -e 's/fs: 0x.*/fs:/g' $TS_OUTPUT ts_finalize_subtest ts_init_subtest "fstab-label" # has to return /mnt/mountpoint -ts_valgrind $TESTPROG --find-forward $FSTAB source "LABEL=$LABEL" &> $TS_OUTPUT +ts_run $TESTPROG --find-forward $FSTAB source "LABEL=$LABEL" &> $TS_OUTPUT sed -i -e 's/fs: 0x.*/fs:/g' $TS_OUTPUT ts_finalize_subtest ts_init_subtest "fstab-dev2label" # has to return /mnt/mountpoint -ts_valgrind $TESTPROG --find-forward $FSTAB source $TS_DEVICE &> $TS_OUTPUT +ts_run $TESTPROG --find-forward $FSTAB source $TS_DEVICE &> $TS_OUTPUT sed -i -e 's/fs: 0x.*/fs:/g' $TS_OUTPUT ts_finalize_subtest @@ -78,7 +78,7 @@ echo "$TS_DEVICE /mnt/mountpoint3 auto defaults" >> $FSTAB ts_init_subtest "fstab-dev" # has to return /mnt/mountpoint3 -ts_valgrind $TESTPROG --find-forward $FSTAB source $TS_DEVICE &> $TS_OUTPUT +ts_run $TESTPROG --find-forward $FSTAB source $TS_DEVICE &> $TS_OUTPUT sed -i -e 's/fs: 0x.*/fs:/g' $TS_OUTPUT sed -i -e 's/source: .*//g' $TS_OUTPUT # devname is generated, remove it ts_finalize_subtest diff --git a/tests/ts/libmount/update b/tests/ts/libmount/update index 1db16d99f..5437058a8 100755 --- a/tests/ts/libmount/update +++ b/tests/ts/libmount/update @@ -33,30 +33,30 @@ has_mtab=$( ts_has_mtab_support ) if [ "$has_mtab" == "yes" ]; then ts_init_subtest "mtab-mount" - ts_valgrind $TESTPROG --add /dev/sda1 /mnt/foo ext3 "rw,bbb,ccc,fff=FFF,ddd,noexec" - ts_valgrind $TESTPROG --add /dev/sdb1 /mnt/bar ext3 "gg=G,ffff=f,ro,noatime" - ts_valgrind $TESTPROG --add /dev/sda2 /mnt/bar ext3 "rw,noatime" - ts_valgrind $TESTPROG --add /dev/sda1 /mnt/gogo ext3 "rw,noatime,nosuid" - ts_valgrind $TESTPROG --add none /proc proc defaults + ts_run $TESTPROG --add /dev/sda1 /mnt/foo ext3 "rw,bbb,ccc,fff=FFF,ddd,noexec" + ts_run $TESTPROG --add /dev/sdb1 /mnt/bar ext3 "gg=G,ffff=f,ro,noatime" + ts_run $TESTPROG --add /dev/sda2 /mnt/bar ext3 "rw,noatime" + ts_run $TESTPROG --add /dev/sda1 /mnt/gogo ext3 "rw,noatime,nosuid" + ts_run $TESTPROG --add none /proc proc defaults cp $LIBMOUNT_MTAB $TS_OUTPUT # save the mtab aside ts_finalize_subtest # checks the mtab ts_init_subtest "mtab-move" - ts_valgrind $TESTPROG --move /mnt/foo /mnt/newfoo - ts_valgrind $TESTPROG --move /mnt/bar /mnt/newbar + ts_run $TESTPROG --move /mnt/foo /mnt/newfoo + ts_run $TESTPROG --move /mnt/bar /mnt/newbar cp $LIBMOUNT_MTAB $TS_OUTPUT # save the mtab aside ts_finalize_subtest # checks the mtab ts_init_subtest "mtab-remount" - ts_valgrind $TESTPROG --remount /mnt/newfoo "ro,noatime" - ts_valgrind $TESTPROG --remount /mnt/bar "rw,atime,nosuid" + ts_run $TESTPROG --remount /mnt/newfoo "ro,noatime" + ts_run $TESTPROG --remount /mnt/bar "rw,atime,nosuid" cp $LIBMOUNT_MTAB $TS_OUTPUT # save the mtab aside ts_finalize_subtest # checks the mtab ts_init_subtest "mtab-umount" - ts_valgrind $TESTPROG --remove /mnt/bar - ts_valgrind $TESTPROG --remove /mnt/gogo - ts_valgrind $TESTPROG --remove /proc + ts_run $TESTPROG --remove /mnt/bar + ts_run $TESTPROG --remove /mnt/gogo + ts_run $TESTPROG --remove /proc cp $LIBMOUNT_MTAB $TS_OUTPUT # save the mtab aside ts_finalize_subtest # checks the mtab fi @@ -72,28 +72,28 @@ rm -f $LIBMOUNT_UTAB > $LIBMOUNT_UTAB ts_init_subtest "utab-mount" -ts_valgrind $TESTPROG --add /dev/sda1 /mnt/foo ext3 "rw,bbb,ccc,fff=FFF,ddd,noexec" -ts_valgrind $TESTPROG --add /dev/sdb1 /mnt/bar ext3 "ro,user" -ts_valgrind $TESTPROG --add /dev/sda2 /mnt/xyz ext3 "rw,loop=/dev/loop0,uhelper=hal" -ts_valgrind $TESTPROG --add none /proc proc "rw,user" +ts_run $TESTPROG --add /dev/sda1 /mnt/foo ext3 "rw,bbb,ccc,fff=FFF,ddd,noexec" +ts_run $TESTPROG --add /dev/sdb1 /mnt/bar ext3 "ro,user" +ts_run $TESTPROG --add /dev/sda2 /mnt/xyz ext3 "rw,loop=/dev/loop0,uhelper=hal" +ts_run $TESTPROG --add none /proc proc "rw,user" cp $LIBMOUNT_UTAB $TS_OUTPUT # save the mtab aside ts_finalize_subtest # checks the mtab ts_init_subtest "utab-move" -ts_valgrind $TESTPROG --move /mnt/bar /mnt/newbar -ts_valgrind $TESTPROG --move /mnt/xyz /mnt/newxyz +ts_run $TESTPROG --move /mnt/bar /mnt/newbar +ts_run $TESTPROG --move /mnt/xyz /mnt/newxyz cp $LIBMOUNT_UTAB $TS_OUTPUT # save the mtab aside ts_finalize_subtest # checks the mtab ts_init_subtest "utab-remount" -ts_valgrind $TESTPROG --remount /mnt/newbar "ro,noatime" -ts_valgrind $TESTPROG --remount /mnt/newxyz "rw,user" +ts_run $TESTPROG --remount /mnt/newbar "ro,noatime" +ts_run $TESTPROG --remount /mnt/newxyz "rw,user" cp $LIBMOUNT_UTAB $TS_OUTPUT # save the mtab aside ts_finalize_subtest # checks the mtab ts_init_subtest "utab-umount" -ts_valgrind $TESTPROG --remove /mnt/newbar -ts_valgrind $TESTPROG --remove /proc +ts_run $TESTPROG --remove /mnt/newbar +ts_run $TESTPROG --remove /proc cp $LIBMOUNT_UTAB $TS_OUTPUT # save the mtab aside ts_finalize_subtest # checks the mtab @@ -105,7 +105,7 @@ rm -f $LIBMOUNT_FSTAB cp "$TS_SELF/files/fstab.comment" $LIBMOUNT_FSTAB ts_init_subtest "fstab-replace" -ts_valgrind $TESTPROG --replace "LABEL=foo" "/mnt/foo" +ts_run $TESTPROG --replace "LABEL=foo" "/mnt/foo" cp $LIBMOUNT_FSTAB $TS_OUTPUT # save the fstab aside ts_finalize_subtest #checks the fstab diff --git a/tests/ts/libmount/utils b/tests/ts/libmount/utils index 47f516336..bc89d4600 100755 --- a/tests/ts/libmount/utils +++ b/tests/ts/libmount/utils @@ -13,48 +13,48 @@ TESTPROG="$TS_HELPER_LIBMOUNT_UTILS" [ -x $TESTPROG ] || ts_skip "test not compiled" ts_init_subtest "match-fstype" -ts_valgrind $TESTPROG --match-fstype ext3 "ext2,ext3,cifs" &> $TS_OUTPUT +ts_run $TESTPROG --match-fstype ext3 "ext2,ext3,cifs" &> $TS_OUTPUT ts_finalize_subtest ts_init_subtest "match-fstype-neg" -ts_valgrind $TESTPROG --match-fstype cifs "ext2,ext3,nocifs" &> $TS_OUTPUT +ts_run $TESTPROG --match-fstype cifs "ext2,ext3,nocifs" &> $TS_OUTPUT ts_finalize_subtest ts_init_subtest "match-fstype-neg2" -ts_valgrind $TESTPROG --match-fstype cifs "noext2,ext3,cifs" &> $TS_OUTPUT +ts_run $TESTPROG --match-fstype cifs "noext2,ext3,cifs" &> $TS_OUTPUT ts_finalize_subtest ts_init_subtest "match-options" -ts_valgrind $TESTPROG --match-options "aaa,bbb=BBB,ccc,ddd" "ccc" &> $TS_OUTPUT +ts_run $TESTPROG --match-options "aaa,bbb=BBB,ccc,ddd" "ccc" &> $TS_OUTPUT ts_finalize_subtest ts_init_subtest "match-options-list" -ts_valgrind $TESTPROG --match-options "aaa,bbb=BBB,ccc,ddd" "ccc,aaa,ddd" &> $TS_OUTPUT +ts_run $TESTPROG --match-options "aaa,bbb=BBB,ccc,ddd" "ccc,aaa,ddd" &> $TS_OUTPUT ts_finalize_subtest ts_init_subtest "match-options-neg" -ts_valgrind $TESTPROG --match-options "aaa,bbb=BBB,ccc,ddd" "noxxx" &> $TS_OUTPUT +ts_run $TESTPROG --match-options "aaa,bbb=BBB,ccc,ddd" "noxxx" &> $TS_OUTPUT ts_finalize_subtest ts_init_subtest "match-options-neg-list" -ts_valgrind $TESTPROG --match-options "aaa,bbb=BBB,ccc,ddd" "ddd,noaaa" &> $TS_OUTPUT +ts_run $TESTPROG --match-options "aaa,bbb=BBB,ccc,ddd" "ddd,noaaa" &> $TS_OUTPUT ts_finalize_subtest ts_init_subtest "match-options-neg-list2" -ts_valgrind $TESTPROG --match-options "aaa,bbb=BBB,ccc,ddd" "noxxx,ccc,aaa" &> $TS_OUTPUT +ts_run $TESTPROG --match-options "aaa,bbb=BBB,ccc,ddd" "noxxx,ccc,aaa" &> $TS_OUTPUT ts_finalize_subtest ts_init_subtest "starts-with" -ts_valgrind $TESTPROG --starts-with "AAAbbbCCC" "AAA" &> $TS_OUTPUT +ts_run $TESTPROG --starts-with "AAAbbbCCC" "AAA" &> $TS_OUTPUT ts_finalize_subtest ts_init_subtest "ends-with" -ts_valgrind $TESTPROG --ends-with "AAAbbbCCC" "CCC" &> $TS_OUTPUT +ts_run $TESTPROG --ends-with "AAAbbbCCC" "CCC" &> $TS_OUTPUT ts_finalize_subtest ts_init_subtest "mountpoint" if [ -d /proc ]; then - ts_valgrind $TESTPROG --mountpoint /proc &> $TS_OUTPUT + ts_run $TESTPROG --mountpoint /proc &> $TS_OUTPUT ts_finalize_subtest else ts_skip_subtest "no /proc" @@ -62,23 +62,23 @@ fi ts_init_subtest "mountpoint-subdir" if [ -d /proc/sys/kernel ]; then - ts_valgrind $TESTPROG --mountpoint /proc/sys/kernel &> $TS_OUTPUT + ts_run $TESTPROG --mountpoint /proc/sys/kernel &> $TS_OUTPUT ts_finalize_subtest else ts_skip_subtest "no /proc" fi ts_init_subtest "mountpoint-root" -ts_valgrind $TESTPROG --mountpoint / &> $TS_OUTPUT +ts_run $TESTPROG --mountpoint / &> $TS_OUTPUT ts_finalize_subtest ts_init_subtest "kernel-cmdline" export LIBMOUNT_KERNEL_CMDLINE="$TS_SELF/files/kernel_cmdline" -ts_valgrind $TESTPROG --kernel-cmdline selinux= >> $TS_OUTPUT 2>&1 -ts_valgrind $TESTPROG --kernel-cmdline selinux >> $TS_OUTPUT 2>&1 -ts_valgrind $TESTPROG --kernel-cmdline ro >> $TS_OUTPUT 2>&1 -ts_valgrind $TESTPROG --kernel-cmdline ro= >> $TS_OUTPUT 2>&1 -ts_valgrind $TESTPROG --kernel-cmdline root= >> $TS_OUTPUT 2>&1 +ts_run $TESTPROG --kernel-cmdline selinux= >> $TS_OUTPUT 2>&1 +ts_run $TESTPROG --kernel-cmdline selinux >> $TS_OUTPUT 2>&1 +ts_run $TESTPROG --kernel-cmdline ro >> $TS_OUTPUT 2>&1 +ts_run $TESTPROG --kernel-cmdline ro= >> $TS_OUTPUT 2>&1 +ts_run $TESTPROG --kernel-cmdline root= >> $TS_OUTPUT 2>&1 ts_finalize_subtest ts_finalize |