From: Karel Zak Date: Wed, 7 Aug 2019 09:45:57 +0000 (+0200) Subject: tests: use subtests for mountpoint(1) X-Git-Tag: v2.35-rc1~288 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=11aaedf5742771b1989add0c3801bbaede6bf3b4;p=thirdparty%2Futil-linux.git tests: use subtests for mountpoint(1) Signed-off-by: Karel Zak --- diff --git a/tests/expected/misc/mountpoint b/tests/expected/misc/mountpoint index e7c20cd25e..e69de29bb2 100644 --- a/tests/expected/misc/mountpoint +++ b/tests/expected/misc/mountpoint @@ -1,9 +0,0 @@ -default -./symlink-to-root is a mountpoint -0 -try --nofollow -./symlink-to-root is not a mountpoint -1 -mutually exclusive -mountpoint: --devno and --nofollow are mutually exclusive -1 diff --git a/tests/expected/misc/mountpoint-default b/tests/expected/misc/mountpoint-default new file mode 100644 index 0000000000..9a7ac6ab31 --- /dev/null +++ b/tests/expected/misc/mountpoint-default @@ -0,0 +1,2 @@ +./symlink-to-root is a mountpoint +0 diff --git a/tests/expected/misc/mountpoint-mutually-exclusive b/tests/expected/misc/mountpoint-mutually-exclusive new file mode 100644 index 0000000000..38c36f13b4 --- /dev/null +++ b/tests/expected/misc/mountpoint-mutually-exclusive @@ -0,0 +1,2 @@ +mountpoint: --devno and --nofollow are mutually exclusive +1 diff --git a/tests/expected/misc/mountpoint-nofollow b/tests/expected/misc/mountpoint-nofollow new file mode 100644 index 0000000000..1ba1749599 --- /dev/null +++ b/tests/expected/misc/mountpoint-nofollow @@ -0,0 +1,2 @@ +./symlink-to-root is not a mountpoint +1 diff --git a/tests/ts/misc/mountpoint b/tests/ts/misc/mountpoint index 0b93a9c362..03c1ccc3ee 100755 --- a/tests/ts/misc/mountpoint +++ b/tests/ts/misc/mountpoint @@ -10,18 +10,20 @@ ts_check_test_command "$TS_CMD_MOUNTPOINT" ln -s / ./symlink-to-root -echo "default" >> $TS_OUTPUT 2>&1 +ts_init_subtest "default" $TS_CMD_MOUNTPOINT ./symlink-to-root >> $TS_OUTPUT 2>&1 echo $? >> $TS_OUTPUT 2>&1 +ts_finalize_subtest -echo "try --nofollow" >> $TS_OUTPUT 2>&1 +ts_init_subtest "nofollow" $TS_CMD_MOUNTPOINT --nofollow ./symlink-to-root >> $TS_OUTPUT 2>&1 echo $? >> $TS_OUTPUT 2>&1 +ts_finalize_subtest -echo "mutually exclusive" >> $TS_OUTPUT 2>&1 +ts_init_subtest "mutually-exclusive" $TS_CMD_MOUNTPOINT --devno --nofollow / >> $TS_OUTPUT 2>&1 echo $? >> $TS_OUTPUT 2>&1 +ts_finalize_subtest rm -f ./symlink-to-root - ts_finalize