Upgrade to CPAN-1.83_58

[p5sagit/p5-mst-13.2.git] / lib / CPAN / t / vcmp.t

diff --git a/lib/CPAN/t/vcmp.t b/lib/CPAN/t/vcmp.t
index a04b423..9152066 100644 (file)
--- a/lib/CPAN/t/vcmp.t
+++ b/lib/CPAN/t/vcmp.t
@@ -15,6 +15,8 @@ while (<DATA>) {
 $N = scalar @$D;
 print "1..$N\n";
 
+my $has_sort_versions = eval { require Sort::Versions; 1 };
+my $has_versionpm = eval { require version; 1 };
 while (@$D) {
   my($l,$r,$exp) = @{shift @$D};
   my $res = CPAN::Version->vcmp($l,$r);
@@ -22,7 +24,21 @@ while (@$D) {
     print "# l[$l]r[$r]exp[$exp]res[$res]\n";
     print "not ";
   }
-  printf "ok %2d # %12s %12s %3d\n", $N-@$D, $l, $r, $res;
+  my @other = ();
+  if ($has_sort_versions) {
+    if (Sort::Versions::versioncmp($l,$r) != $res) {
+      push @other, sprintf "SV: %d", Sort::Versions::versioncmp($l,$r);
+    }
+  }
+  if ($has_versionpm) {
+    local $^W;
+    my $vres = version->new($l) cmp version->new($r);
+    if ($vres != $res) {
+      push @other, sprintf "v.pm: %d", $vres;
+    }
+  }
+  my $other = @other ? " (".join("; ", @other).")" : "";
+  printf "ok %2d # %12s %12s %3d%s\n", $N-@$D, $l, $r, $res, $other;
 }
 
 __END__
@@ -46,12 +62,15 @@ VERSION VERSION 0
 0.2.10 0.2 -1
 20000000.00 19990108 1
 1.00 0.96 1
+0.7.2 0.7 -1
 0.7.02 0.7 -1
+0.07.02 0.7 -1
 1.3a5 1.3 1
 undef 1.00 -1
 v1.0 undef 1
 v0.2.4 0.24 -1
 v1.0.22 122 -1
+1.0.22 122 -1
 5.00556 v5.5.560 0
 5.005056 v5.5.56 0
 5.00557 v5.5.560 1
@@ -63,6 +82,10 @@ v1.0.22 122 -1
 0.01.04 0.001004 0
 0.05.18 0.005018 0
 4.08.00 4.008000 0
+0.001.004 0.001004 0
+0.005.018 0.005018 0
+4.008.000 4.008000 0
+4.008.000 4.008 1
 __END__
 
 # Local Variables: