Changeset 3801 in MondoRescue for branches/3.3/MondoRescue
- Timestamp:
- Feb 16, 2024, 12:43:53 AM (4 months ago)
- Location:
- branches/3.3/MondoRescue
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/3.3/MondoRescue/lib/MondoRescue/File.pm
r3795 r3801 156 156 if (defined $link) { 157 157 $link = mr_file_normalize($link,"$curdir/$dir"); 158 # It's a real symlink on a fileso handle it159 $files->{$f}->{"$curdir/$dir"} = 1 if ((not -d $link) && (not -d "/$link"));158 # It's a real symlink so handle it 159 $files->{$f}->{"$curdir/$dir"} = 1; 160 160 if (substr($link,0,1) eq "/") { 161 161 $curdir = $link; … … 170 170 foreach my $k (keys %$h) { 171 171 foreach my $l (keys %$k) { 172 # Use $f as key as we affect all the files172 # Use $f as key as we affects all the files 173 173 # found in recursion to the current managed file 174 174 $files->{$f}->{$l} = 1; -
branches/3.3/MondoRescue/t/01-read-all-link.t
r3795 r3801 7 7 # Create the structure for the tests 8 8 my $bd = tempdir( 9 #CLEANUP => 19 CLEANUP => 1 10 10 ); 11 11 … … 23 23 copy "/usr/bin/perl","usr/bin" || die "$!"; 24 24 chmod 0755,"usr/bin/perl"; 25 my $libc; 25 26 foreach my $f (<"/lib/libc.so.[0-9]*">) { 26 27 copy "$f","usr/lib" || die "$!"; 28 $libc = $f; 27 29 } 28 30 … … 55 57 ); 56 58 57 eval { 58 require Test; 59 Test->import(); 59 my $more = 1; 60 61 eval 62 { 63 require Test::More; 64 Test::More->import(); 65 no_plan(); 60 66 }; 67 # Test::More not found so simpler test 61 68 if ($@) { 62 require Test::Simple; 63 Test::Simple->import(); 69 $more = 0; 70 eval { 71 require Test; 72 Test->import(); 73 }; 74 if ($@) { 75 require Test::Simple; 76 Test::Simple->import(); 77 } 64 78 } 65 79 plan(tests => 12); … … 83 97 sub myis { 84 98 85 my $p1 = shift; 86 my $p2 = shift; 87 my $p3 = shift; 88 print "# test $p3\n"; 89 return(ok($p1,$p2)); 99 if ($more eq 1) { 100 return(is(@_)); 101 } else { 102 my $p1 = shift; 103 my $p2 = shift; 104 my $p3 = shift; 105 print "# test $p3\n"; 106 return(ok($p1,$p2)); 90 107 } 108 } 109
Note:
See TracChangeset
for help on using the changeset viewer.