summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--tests/expected/misc/mountpoint9
-rw-r--r--tests/expected/misc/mountpoint-default2
-rw-r--r--tests/expected/misc/mountpoint-mutually-exclusive2
-rw-r--r--tests/expected/misc/mountpoint-nofollow2
-rwxr-xr-xtests/ts/misc/mountpoint10
5 files changed, 12 insertions, 13 deletions
diff --git a/tests/expected/misc/mountpoint b/tests/expected/misc/mountpoint
index e7c20cd25..e69de29bb 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 000000000..9a7ac6ab3
--- /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 000000000..38c36f13b
--- /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 000000000..1ba174959
--- /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 0b93a9c36..03c1ccc3e 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