merge b_devel -> b_eq: 20030909

only kernel pass sanity, liblustre still broken

diff --git a/lustre/tests/leak_finder.pl b/lustre/tests/leak_finder.pl
index 745f113..11e880a 100644 (file)
--- a/lustre/tests/leak_finder.pl
+++ b/lustre/tests/leak_finder.pl
@@ -14,15 +14,15 @@ my $max = 0;
 while ($line = <>) {
     $debug_line++;
     my ($file, $func, $lno, $name, $size, $addr, $type);
-    if ($line =~ m/^.*\((.*):(\d+):(.*)\(\) (\d+ \| )?\d+\+\d+\): (k|v|slab-)(.*) '(.*)': (\d+) at (.*) \(tot (.*)\).*$/) {
-        $file = $1;
-        $lno = $2;
-        $func = $3;
-        $type = $6;
-        $name = $7;
-        $size = $8;
-        $addr = $9;
-        $tot = $10;
+    if ($line =~ m/^.* :(k|v|slab-)(.*) '(.*)': (\d+) at (.*) \(tot (.*)\)(|\.):\((.*):(\d+):(.*)\(\) (\d+) \| \d+\+\d+\).*$/){
+       $type = $2;
+       $name = $3;
+       $size = $4;
+       $addr = $5;
+       $tot = $6;
+       $file = $8;
+       $lno = $9;
+       $func = $10;
 
        # we can't dump the log after portals has exited, so skip "leaks"
        # from memory freed in the portals module unloading.

diff --git a/lustre/tests/openunlink.c b/lustre/tests/openunlink.c
index 26bfe79..4a0d8c3 100644 (file)
--- a/lustre/tests/openunlink.c
+++ b/lustre/tests/openunlink.c
@@ -75,7 +75,7 @@ int main(int argc, char **argv)
                 exit(1);
         }
 
-        fprintf(stderr, "fstating\n");
+        fprintf(stderr, "fstat...\n");
         rc = fstat(fd, &st);
         if (rc) {
                 fprintf(stderr, "fstat (unlink) %s\n", strerror(errno));