[svn:dbi] rev 219 - in dbi/trunk: . t

[timbo]

Author: timbo
Date: Thu Mar 11 15:48:57 2004
New Revision: 219

Modified:
   dbi/trunk/DBI.xs
   dbi/trunk/t/50dbm.t
Log:
-    else if (Perl_sv_derived_from(hrv, "DBI::common")) {
+    else if (sv_derived_from(hrv, "DBI::common")) {
Make t/50dbm.t be even more conservative.


Modified: dbi/trunk/DBI.xs
==============================================================================
--- dbi/trunk/DBI.xs    (original)
+++ dbi/trunk/DBI.xs    Thu Mar 11 15:48:57 2004
@@ -753,7 +753,7 @@
        sv = SvRV(hrv);
     else if (hrv == DBI_LAST_HANDLE)   /* special for var::FETCH */
        sv = DBI_LAST_HANDLE;
-    else if (Perl_sv_derived_from(hrv, "DBI::common")) {
+    else if (sv_derived_from(hrv, "DBI::common")) {
        /* probably a class name, if ref($h)->foo() */
        return 0;
     }

Modified: dbi/trunk/t/50dbm.t
==============================================================================
--- dbi/trunk/t/50dbm.t (original)
+++ dbi/trunk/t/50dbm.t Thu Mar 11 15:48:57 2004
@@ -11,9 +11,12 @@
     # Be conservative about what modules we use here.
     # We don't want to be tripped up by a badly installed module
     # so we remove from @INC any version-specific dirs that don't
-    # also have an arch-specific dir.
+    # also have an arch-specific dir. Plus, for 5.8 remove any <=5.7
     my %inc = map { $_ => 1 } @INC;
-    my @del = grep { m:/5\.[0-9.]+$: && !$inc{"$_/$Config{archname}"} } @INC;
+    my @del = grep {
+          m:/5\.[0-9.]+$: && !$inc{"$_/$Config{archname}"}
+       or m:/5\.[0-7]:    && $] >= 5.8
+    } @INC;
     my %del = map { $_ => 1 } @del;
     @INC = grep { !$del{$_} } @INC;
     print "Removed some old dirs from [EMAIL PROTECTED] for this test: @del\n" if 
@del;