summaryrefslogtreecommitdiff
path: root/tests/ts
diff options
context:
space:
mode:
authorKarel Zak <kzak@redhat.com>2010-10-19 11:44:30 +0200
committerKarel Zak <kzak@redhat.com>2011-01-03 12:28:45 +0100
commitf27feed36e589191622c444f7c19a2e4d6cbe51a (patch)
tree04185fb256adea13c65a4be3324f0f3fe8ae01d6 /tests/ts
parent9208fc2292cd066582167fed842925df50fed675 (diff)
downloadutil-linux-old-f27feed36e589191622c444f7c19a2e4d6cbe51a.tar.gz
tests: add libmount utils.c tests
Signed-off-by: Karel Zak <kzak@redhat.com>
Diffstat (limited to 'tests/ts')
-rwxr-xr-xtests/ts/libmount/optstr2
-rwxr-xr-xtests/ts/libmount/tabfiles2
-rwxr-xr-xtests/ts/libmount/tabfiles-tags3
-rwxr-xr-xtests/ts/libmount/utils77
4 files changed, 81 insertions, 3 deletions
diff --git a/tests/ts/libmount/optstr b/tests/ts/libmount/optstr
index 1bc8d18c..11b707d0 100755
--- a/tests/ts/libmount/optstr
+++ b/tests/ts/libmount/optstr
@@ -8,7 +8,7 @@ TS_DESC="options string"
. $TS_TOPDIR/functions.sh
ts_init "$*"
-TESTPROG="$TS_HELPER_OPTSTR"
+TESTPROG="$TS_HELPER_LIBMOUNT_OPTSTR"
ts_init_subtest "append"
$TESTPROG --append "aaa,bbb=BBB,ccc" "ddd" &> $TS_OUTPUT
diff --git a/tests/ts/libmount/tabfiles b/tests/ts/libmount/tabfiles
index 3367fab5..2de86807 100755
--- a/tests/ts/libmount/tabfiles
+++ b/tests/ts/libmount/tabfiles
@@ -8,7 +8,7 @@ TS_DESC="tab files"
. $TS_TOPDIR/functions.sh
ts_init "$*"
-TESTPROG="$TS_HELPER_TABFILES"
+TESTPROG="$TS_HELPER_LIBMOUNT_TAB"
ts_init_subtest "parse-fstab"
$TESTPROG --parse "$TS_SELF/files/fstab" &> $TS_OUTPUT
diff --git a/tests/ts/libmount/tabfiles-tags b/tests/ts/libmount/tabfiles-tags
index 2f9f6c45..da76724b 100755
--- a/tests/ts/libmount/tabfiles-tags
+++ b/tests/ts/libmount/tabfiles-tags
@@ -7,6 +7,8 @@ TS_DESC="tags"
ts_init "$*"
ts_skip_nonroot
+TESTPROG="$TS_HELPER_LIBMOUNT_TAB"
+
#
# Init device
#
@@ -32,7 +34,6 @@ UUID="de1bc6e9-34ab-4151-a1d7-900042eee8d9"
mkfs.ext3 -F -L $LABEL $DEVICE -U $UUID &> /dev/null || ts_die "Cannot make ext3 on $DEVICE" $DEVICE
ts_device_has_uuid $DEVICE || ts_die "Cannot found UUID on $DEVICE" $DEVICE
-TESTPROG="$TS_HELPER_TABFILES"
FSTAB="$TS_OUTDIR/fstab"
#
diff --git a/tests/ts/libmount/utils b/tests/ts/libmount/utils
new file mode 100755
index 00000000..e06c9b9c
--- /dev/null
+++ b/tests/ts/libmount/utils
@@ -0,0 +1,77 @@
+#!/bin/bash
+
+# Copyright (C) 2010 Karel Zak <kzak@redhat.com>
+
+TS_TOPDIR="$(dirname $0)/../.."
+TS_DESC="utils"
+
+. $TS_TOPDIR/functions.sh
+ts_init "$*"
+
+TESTPROG="$TS_HELPER_LIBMOUNT_UTILS"
+
+ts_init_subtest "match-fstype"
+$TESTPROG --match-fstype ext3 "ext2,ext3,cifs" &> $TS_OUTPUT
+ts_finalize_subtest
+
+ts_init_subtest "match-fstype-neg"
+$TESTPROG --match-fstype cifs "ext2,ext3,nocifs" &> $TS_OUTPUT
+ts_finalize_subtest
+
+ts_init_subtest "match-fstype-neg2"
+$TESTPROG --match-fstype cifs "noext2,ext3,cifs" &> $TS_OUTPUT
+ts_finalize_subtest
+
+ts_init_subtest "match-options"
+$TESTPROG --match-options "aaa,bbb=BBB,ccc,ddd" "ccc" &> $TS_OUTPUT
+ts_finalize_subtest
+
+ts_init_subtest "match-options-list"
+$TESTPROG --match-options "aaa,bbb=BBB,ccc,ddd" "ccc,aaa,ddd" &> $TS_OUTPUT
+ts_finalize_subtest
+
+ts_init_subtest "match-options-neg"
+$TESTPROG --match-options "aaa,bbb=BBB,ccc,ddd" "noxxx" &> $TS_OUTPUT
+ts_finalize_subtest
+
+ts_init_subtest "match-options-neg-list"
+$TESTPROG --match-options "aaa,bbb=BBB,ccc,ddd" "ddd,noaaa" &> $TS_OUTPUT
+ts_finalize_subtest
+
+ts_init_subtest "match-options-neg-list2"
+$TESTPROG --match-options "aaa,bbb=BBB,ccc,ddd" "noxxx,ccc,aaa" &> $TS_OUTPUT
+ts_finalize_subtest
+
+ts_init_subtest "starts-with"
+$TESTPROG --starts-with "AAAbbbCCC" "AAA" &> $TS_OUTPUT
+ts_finalize_subtest
+
+ts_init_subtest "ends-with"
+$TESTPROG --ends-with "AAAbbbCCC" "CCC" &> $TS_OUTPUT
+ts_finalize_subtest
+
+ts_init_subtest "mountpoint"
+$TESTPROG --mountpoint /proc &> $TS_OUTPUT
+ts_finalize_subtest
+
+ts_init_subtest "mountpoint-subdir"
+$TESTPROG --mountpoint /proc/sys/kernel &> $TS_OUTPUT
+ts_finalize_subtest
+
+ts_init_subtest "mountpoint-root"
+$TESTPROG --mountpoint / &> $TS_OUTPUT
+ts_finalize_subtest
+
+ts_init_subtest "fs-root"
+$TESTPROG --fs-root /proc &> $TS_OUTPUT
+ts_finalize_subtest
+
+ts_init_subtest "fs-root-subdir"
+$TESTPROG --fs-root /proc/sys/kernel &> $TS_OUTPUT
+ts_finalize_subtest
+
+ts_init_subtest "fs-root-subdir2"
+$TESTPROG --fs-root /etc &> $TS_OUTPUT
+ts_finalize_subtest
+
+ts_finalize