From: Jim Meyering Date: Tue, 21 Nov 2006 08:32:55 +0000 (+0100) Subject: * tests/rm/one-file-system: Upon setup failure (e.g., mount failure), X-Git-Tag: COREUTILS-6_6~5 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=d66091126a729ffbdc53ac52cf31cb0b30e6711e;p=thirdparty%2Fcoreutils.git * tests/rm/one-file-system: Upon setup failure (e.g., mount failure), skip the test rather than failing. Reported by Michael Deutschmann. --- diff --git a/ChangeLog b/ChangeLog index 2c999f46f4..3ac63fb00a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,8 @@ 2006-11-21 Jim Meyering + * 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 bb7ffeb205..66c04d5ec0 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