From: Jim Meyering <meyering@redhat.com>
Date: Tue, 5 May 2009 05:54:47 +0000 (+0200)
Subject: tests: rm/one-file-system: umount more reliably
X-Git-Tag: v7.4~3
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8d00fb26f1bd5847f8e1318fdb99c8ef256dbece;p=thirdparty%2Fcoreutils.git

tests: rm/one-file-system: umount more reliably

* tests/rm/one-file-system: Run umount via trap, so it runs
also upon irregular termination.
---

diff --git a/tests/rm/one-file-system b/tests/rm/one-file-system
index 2de7678dda..c8e11eb54c 100755
--- a/tests/rm/one-file-system
+++ b/tests/rm/one-file-system
@@ -1,7 +1,7 @@
 #!/bin/sh
 # Demonstrate rm's new --one-file-system option.
 
-# Copyright (C) 2006-2008 Free Software Foundation, Inc.
+# Copyright (C) 2006-2009 Free Software Foundation, Inc.
 
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -25,7 +25,11 @@ fi
 require_root_
 
 # If used, these must *follow* test-lib.sh.
-cleanup_() { rm -rf "$other_partition_tmpdir"; }
+cleanup_()
+{
+  umount "$other_partition_tmpdir"
+  rm -rf "$other_partition_tmpdir"
+}
 . "$abs_srcdir/other-fs-tmpdir"
 
 t=$other_partition_tmpdir
@@ -41,7 +45,6 @@ fail=0
 
 rm --one-file-system -rf a 2> out && fail=1
 test -d $t/y || fail=1
-umount $t
 
 compare out exp || fail=1