Changeset 3904 in MondoRescue

Timestamp:

Dec 24, 2024, 2:55:10 AM (6 months ago)

Author:

Bruno Cornec

Message:

quality now also reports mr_getcwd

Location:

branches/3.3

Files:

• MondoRescue/lib/MondoRescue/File.pm (modified) (1 diff)
• MondoRescue/t/01-read-all-link.t (modified) (5 diffs)
• tools/quality (modified) (1 diff)

branches/3.3/MondoRescue/lib/MondoRescue/File.pm

@@ -156 +156 @@
         if (defined $link) {
             $link = mr_file_normalize($link,"$curdir/$dir");
-            # It's a real symlink on a file so handle it
-            $files->{$f}->{"$curdir/$dir"} = 1 if ((not -d $link) && (not -d "/$link"));
+            # It's a real symlink so handle it
+            $files->{$f}->{"$curdir/$dir"} = 1;
             if (substr($link,0,1) eq "/") {
                 $curdir = $link;

branches/3.3/MondoRescue/t/01-read-all-link.t

@@ -7 +7 @@
 # Create the structure for the tests
 my $bd = tempdir( 
-    #CLEANUP => 1 
+    CLEANUP => 1 
     );
 
@@ -23 +23 @@
 copy "/usr/bin/perl","usr/bin" || die "$!";
 chmod 0755,"usr/bin/perl";
+my $libc;
 foreach my $f (<"/lib/libc.so.[0-9]*">) {
     copy "$f","usr/lib" || die "$!";
+    $libc = $f;
 }
 
@@ -55 +57 @@
     );
 
-eval {
-    require Test;
-    Test->import();
+my $more = 1;
+
+eval
+{
+        require Test::More;
+        Test::More->import();
+        no_plan();
 };
+# Test::More not found so simpler test
 if ($@) {
-        require Test::Simple;
-    Test::Simple->import();
+    $more = 0;
+    eval {
+        require Test;
+        Test->import();
+    };
+    if ($@) {
+        require Test::Simple;
+        Test::Simple->import();
+    }
 }
 plan(tests => 12);
@@ -72 +86 @@
 myis($h->{"$bd/var/spool/toto"}->{"$bd/var/spool/toto"}, 1, "File link in another relative dir to itself");
 myis($h->{"$bd/var/spool/toto"}->{"$bd/usr/bin/perl"}, 1, "File link in another relative dir to link");
-# Dirs
 myis($h->{"$bd/var/spool/titi"}->{"$bd/var/spool/titi"}, 1, "Directory link in same dir to itself");
 myis($h->{"$bd/var/spool/titi"}->{"$bd/var/spool/mail"}, 1, "Directory link in same dir to link");
@@ -84 +97 @@
 sub myis {
 
+if ($more eq 1) {
+    return(is(@_));
+} else {
     my $p1 = shift;
     my $p2 = shift;
     my $p3 = shift;
+    print "# test $p3\n";
+    return(ok($p1,$p2));
+}
+}
 
-    my $list1 = mr_file_read_all_link($p1);
-    my $list2 = mr_file_read_all_link($p2);
-    # TBD return(ok(mr_file_normalize($p1),mr_file_normalize($p2),$p3));
-    return(ok(1,1,$p3));
-}

branches/3.3/tools/quality

@@ -28 +28 @@
 
 # How many sprintf/strcat/strcpy vs asprintf are they
-for s in asprintf mr_asprintf sprintf snprintf strcat mr_strcat strcpy strncpy fgets malloc mr_malloc malloc_string getline mr_getline MAX_STR_LEN getcwd goto free mr_free paranoid_free paranoid_system mr_system assert; do
+for s in asprintf mr_asprintf sprintf snprintf strcat mr_strcat strcpy strncpy fgets malloc mr_malloc malloc_string getline mr_getline MAX_STR_LEN getcwd mr_getcwd goto free mr_free paranoid_free paranoid_system mr_system assert; do
     echo "mondorescue $s usage : "
     tot=0