summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog3
-rwxr-xr-xtests/rm/one-file-system4
2 files changed, 5 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 2c999f46f..3ac63fb00 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
2006-11-21 Jim Meyering <jim@meyering.net>
+ * tests/rm/one-file-system: Upon setup failure (e.g., mount failure),
+ skip the test rather than failing. Reported by Michael Deutschmann.
+
* tests/rm/fail-eperm: Use the "(exit N); exit N" idiom,
rather than just "exit N".
diff --git a/tests/rm/one-file-system b/tests/rm/one-file-system
index bb7ffeb20..66c04d5ec 100755
--- a/tests/rm/one-file-system
+++ b/tests/rm/one-file-system
@@ -51,8 +51,8 @@ rm: skipping `a/b', since it's on a different device
EOF
if test $framework_failure = 1; then
- echo "$0: failure in testing framework" 1>&2
- (exit 1); exit 1
+ echo "$0: setup failed; skipping this test" 1>&2
+ (exit 77); exit 77
fi
fail=0