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/context | |
| 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/context')
| -rwxr-xr-x | tests/ts/libmount/context | 22 |
1 files changed, 11 insertions, 11 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 |