I broke llcleanup earlier. This fixes it.

diff --git a/lustre/tests/common.sh b/lustre/tests/common.sh
index 8c4c269..6357dee 100644 (file)
--- a/lustre/tests/common.sh
+++ b/lustre/tests/common.sh
@@ -606,9 +606,11 @@ cleanup_mount() {
        [ "$MOUNT_LIST" ] || fail "error: $0: MOUNT_LIST unset"
 
        for THEMOUNT in $MOUNT_LIST; do
-           if [ "`mount | grep $THEMOUNT`" ]; then
-               umount $THEMOUNT || fail "unable to unmount $THEMOUNT"
-           fi
+           eval "echo \$$THEMOUNT" | while read MTPT THEOSC THEMDC; do
+                if [ "`mount | grep $MTPT`" ]; then
+                    umount $MTPT || fail "unable to unmount $MTPT"
+                fi
+            done
        done
 }
 

diff --git a/lustre/tests/create.pl b/lustre/tests/create.pl
index 12e28c2..f5e6d9b 100644 (file)
--- a/lustre/tests/create.pl
+++ b/lustre/tests/create.pl
@@ -10,7 +10,7 @@ sub usage () {
 my $mtpt = shift || usage();
 my $mount_count = shift || usage();
 my $i = shift || usage();
-my $files = 5;
+my $files = 2;
 
 while ($i--) {
     $which = int(rand() * $mount_count) + 1;