summaryrefslogtreecommitdiffstats
path: root/tests/ts/libmount
diff options
context:
space:
mode:
authorKarel Zak2017-05-30 10:47:06 +0200
committerKarel Zak2017-05-30 11:03:28 +0200
commitbd4f50f0441330259c437f3cfc4a779c01d90617 (patch)
treef8d746b8d69b2d265130f7a09273bdcf3023141b /tests/ts/libmount
parentlib/loopdev: remove unnecessary header (diff)
downloadkernel-qcow2-util-linux-bd4f50f0441330259c437f3cfc4a779c01d90617.tar.gz
kernel-qcow2-util-linux-bd4f50f0441330259c437f3cfc4a779c01d90617.tar.xz
kernel-qcow2-util-linux-bd4f50f0441330259c437f3cfc4a779c01d90617.zip
tests: make /proc optional
Reported-by: Assaf Gordon <assafgordon@gmail.com> Signed-off-by: Karel Zak <kzak@redhat.com>
Diffstat (limited to 'tests/ts/libmount')
-rwxr-xr-xtests/ts/libmount/utils16
1 files changed, 12 insertions, 4 deletions
diff --git a/tests/ts/libmount/utils b/tests/ts/libmount/utils
index 3ace0ec73..47f516336 100755
--- a/tests/ts/libmount/utils
+++ b/tests/ts/libmount/utils
@@ -53,12 +53,20 @@ ts_valgrind $TESTPROG --ends-with "AAAbbbCCC" "CCC" &> $TS_OUTPUT
ts_finalize_subtest
ts_init_subtest "mountpoint"
-ts_valgrind $TESTPROG --mountpoint /proc &> $TS_OUTPUT
-ts_finalize_subtest
+if [ -d /proc ]; then
+ ts_valgrind $TESTPROG --mountpoint /proc &> $TS_OUTPUT
+ ts_finalize_subtest
+else
+ ts_skip_subtest "no /proc"
+fi
ts_init_subtest "mountpoint-subdir"
-ts_valgrind $TESTPROG --mountpoint /proc/sys/kernel &> $TS_OUTPUT
-ts_finalize_subtest
+if [ -d /proc/sys/kernel ]; then
+ ts_valgrind $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