Changeset 3801 in MondoRescue for branches/3.3/MondoRescue/t

Timestamp:

Feb 16, 2024, 12:43:53 AM (3 months ago)

Author:

Bruno Cornec

Message:

Hopefully improve again commit hook

File:

• branches/3.3/MondoRescue/t/01-read-all-link.t (modified) (4 diffs)

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);
@@ -83 +97 @@
 sub myis {
 
-my $p1 = shift;
-my $p2 = shift;
-my $p3 = shift;
-print "# test $p3\n";
-return(ok($p1,$p2));
+if ($more eq 1) {
+    return(is(@_));
+} else {
+    my $p1 = shift;
+    my $p2 = shift;
+    my $p3 = shift;
+    print "# test $p3\n";
+    return(ok($p1,$p2));
 }
+}
+