From fa9ae62a9ee2bbdf85f30b288f41101c0c890238 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?P=C3=A1draig=20Brady?= <address@hidden>
Date: Sat, 16 Jan 2016 13:53:48 +0000
Subject: [PATCH] tests: show mount list on failure for df tests

* init.cfg (dump_mount_list_): A new function to output the
system mount list.
* tests/df/df-symlink.sh: Call dump_mount_list_ upon failure.
* tests/df/over-mount-device.sh: Likewise.
* tests/df/problematic-chars.sh: Likewise.
* tests/df/skip-rootfs.sh: Likewise.
* tests/df/total-verify.sh: Likewise.
* tests/df/unreadable.sh: Likewise.
---
 init.cfg                      | 8 ++++++++
 tests/df/df-symlink.sh        | 2 ++
 tests/df/over-mount-device.sh | 2 ++
 tests/df/problematic-chars.sh | 2 ++
 tests/df/skip-rootfs.sh       | 2 ++
 tests/df/total-verify.sh      | 2 ++
 tests/df/unreadable.sh        | 2 ++
 7 files changed, 20 insertions(+)

diff --git a/init.cfg b/init.cfg
index 108fd20..db86194 100644
--- a/init.cfg
+++ b/init.cfg
@@ -92,6 +92,14 @@ require_mount_list_()
     skip_ "$mount_list_fail"
 }
 
+dump_mount_list_()
+{
+  cat /proc/self/mountinfo ||
+  cat /proc/self/mounts ||
+  cat /proc/mounts ||
+  cat /etc/mtab
+}
+
 require_local_dir_()
 {
   require_mount_list_
diff --git a/tests/df/df-symlink.sh b/tests/df/df-symlink.sh
index a9d8c96..01dff24 100755
--- a/tests/df/df-symlink.sh
+++ b/tests/df/df-symlink.sh
@@ -39,4 +39,6 @@ if test "$(df --output=source | grep -F "$disk" | wc -l)" = 1; then
   compare exp out || fail=1
 fi
 
+test "$fail" = 1 && dump_mount_list_
+
 Exit $fail
diff --git a/tests/df/over-mount-device.sh b/tests/df/over-mount-device.sh
index eb8af92..479d36d 100755
--- a/tests/df/over-mount-device.sh
+++ b/tests/df/over-mount-device.sh
@@ -54,4 +54,6 @@ test $(wc -l < out) = 2 || fail=1
 
 compare exp err || fail=1
 
+test "$fail" = 1 && dump_mount_list_
+
 Exit $fail
diff --git a/tests/df/problematic-chars.sh b/tests/df/problematic-chars.sh
index 2020a12..59ee055 100755
--- a/tests/df/problematic-chars.sh
+++ b/tests/df/problematic-chars.sh
@@ -41,4 +41,6 @@ test $skip = 1 \
 
 test $(df "$mnt" | wc -l) = 2 || fail=1
 
+test "$fail" = 1 && dump_mount_list_
+
 Exit $fail
diff --git a/tests/df/skip-rootfs.sh b/tests/df/skip-rootfs.sh
index e79d424..c893144 100755
--- a/tests/df/skip-rootfs.sh
+++ b/tests/df/skip-rootfs.sh
@@ -48,4 +48,6 @@ grep '^rootfs' out || { fail=1; cat out; }
 df -a -x rootfs >out || fail=1
 grep '^rootfs' out && { fail=1; cat out; }
 
+test "$fail" = 1 && dump_mount_list_
+
 Exit $fail
diff --git a/tests/df/total-verify.sh b/tests/df/total-verify.sh
index d0b2b7b..79722e4 100755
--- a/tests/df/total-verify.sh
+++ b/tests/df/total-verify.sh
@@ -62,4 +62,6 @@ cat inode
 $PERL check-df space || fail=1
 $PERL check-df inode || fail=1
 
+test "$fail" = 1 && dump_mount_list_
+
 Exit $fail
diff --git a/tests/df/unreadable.sh b/tests/df/unreadable.sh
index c1c990f..c575472 100755
--- a/tests/df/unreadable.sh
+++ b/tests/df/unreadable.sh
@@ -24,4 +24,6 @@ touch unreadable || fail=1
 chmod a-r unreadable || fail=1
 df unreadable || fail=1
 
+test "$fail" = 1 && dump_mount_list_
+
 Exit $fail
-- 
2.5.0