summaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
authorKarel Zak2012-11-08 11:52:23 +0100
committerKarel Zak2012-11-08 11:59:36 +0100
commitf308ec19a71327b5601915ce6f8064eefe6ee0d5 (patch)
tree8b051b874848ea710e584e18751451e1bfe962eb /tests
parentdocs: update TODO file (diff)
downloadkernel-qcow2-util-linux-f308ec19a71327b5601915ce6f8064eefe6ee0d5.tar.gz
kernel-qcow2-util-linux-f308ec19a71327b5601915ce6f8064eefe6ee0d5.tar.xz
kernel-qcow2-util-linux-f308ec19a71327b5601915ce6f8064eefe6ee0d5.zip
libmount: add private mnt_get_kernel_cmdline_option()
Signed-off-by: Karel Zak <kzak@redhat.com>
Diffstat (limited to 'tests')
-rw-r--r--tests/expected/libmount/utils-kernel-cmdline5
-rw-r--r--tests/ts/libmount/files/kernel_cmdline1
-rwxr-xr-xtests/ts/libmount/utils9
3 files changed, 15 insertions, 0 deletions
diff --git a/tests/expected/libmount/utils-kernel-cmdline b/tests/expected/libmount/utils-kernel-cmdline
new file mode 100644
index 000000000..2a6316583
--- /dev/null
+++ b/tests/expected/libmount/utils-kernel-cmdline
@@ -0,0 +1,5 @@
+'selinux=' found, argument: '0'
+'selinux' not found
+'ro' found
+'ro=' not found
+'root=' found, argument: 'UUID=33230ae2-1093-4353-824c-f7ca09a2a882'
diff --git a/tests/ts/libmount/files/kernel_cmdline b/tests/ts/libmount/files/kernel_cmdline
new file mode 100644
index 000000000..37a0c89e9
--- /dev/null
+++ b/tests/ts/libmount/files/kernel_cmdline
@@ -0,0 +1 @@
+rd.md=0 rd.lvm=0 rd.dm=0 KEYTABLE=us root=UUID=33230ae2-1093-4353-824c-f7ca09a2a882 rd.luks=0 SYSFONT=latarcyrheb-sun16 ro LANG=en_US.UTF-8 selinux=0
diff --git a/tests/ts/libmount/utils b/tests/ts/libmount/utils
index d425400ad..6facaad10 100755
--- a/tests/ts/libmount/utils
+++ b/tests/ts/libmount/utils
@@ -76,4 +76,13 @@ ts_init_subtest "fs-root-subdir2"
ts_valgrind $TESTPROG --fs-root /etc &> $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
+ts_valgrind $TESTPROG --kernel-cmdline selinux &>> $TS_OUTPUT
+ts_valgrind $TESTPROG --kernel-cmdline ro &>> $TS_OUTPUT
+ts_valgrind $TESTPROG --kernel-cmdline ro= &>> $TS_OUTPUT
+ts_valgrind $TESTPROG --kernel-cmdline root= &>> $TS_OUTPUT
+ts_finalize_subtest
+
ts_finalize