All tests run under the same Perl environment

(autoflush on, and warnings enabled via $^W = 1)

Changes

@@ -1,18 +1,23 @@
 Revision history for Perl extension DBD-SQLite.
 
 1.19_06 not yet released
-    - fixed a segv with an error function under x86 linux
+    - Fixed a segv with an error function under x86 linux
       (and hopefully Mac OSX). (TOKUHIROM)
-    - fixed yet another segv while testing DBIC reconnection (DMAKI)
+    - Fixed yet another segv while testing DBIC reconnection (DMAKI)
-    - minor test improvement (ISHIGAKI)
+    - Switched from Test.pm to Test::More (though there're still
-      - switched from Test.pm to Test::More (though there're still
+      some tests that don't use Test::More) (ISHIGAKI)
-        some tests that don't use Test::More)
+    - Added "use strict" to some. (ISHIGAKI)
-      - added "use strict" to some.
+    - Added a cleanup block to each test to allow it run clean and
-      - added a cleanup block to each test to allow it run clean and
+      separately. (ISHIGAKI)
-        separately.
+    - Adding an explicit minimum Perl version to the Makefile.PL (ADAMK)
+    - Setting configure_requires dependencies for File::Spec
+    - Splitting the LICENSE key into it's own MakeMaker
+      version-dependency conditional (ADAMK)
+    - All tests run under the same Perl environment
+      (autoflush on, and warnings enabled via $^W = 1) (ADAMK)
 
 1.19_05 Thu  2 Apr 2009
-    - DBD::SQLite::Amalgamation 3.6.1.2 and DBD::SQLite 1.19_04
+    - DBD::SQLite::Amalgamation 3.6.1.2 and DBD::SQLite 1.19
       should be feature identical now.
     - Added collations from DBD::SQLite::Amalgamation (CORION)
     - Removed statement handle activation after "execute" if

Makefile.PL

@@ -3,6 +3,20 @@ use strict;
 use ExtUtils::MakeMaker;
 use Config;
 
+# Some dependencies need to be more aggressive on Windows
+sub WINLIKE () {
+	return 1 if $^O eq 'MSWin32';
+	return 1 if $^O eq 'cygwin';
+	return '';
+}
+
+# Make setting optional MakeMaker parameters more readable
+sub OPTIONAL {
+	return () unless $ExtUtils::MakeMaker::VERSION ge shift;
+	return @_;
+}
+
+# Are we upgrading from a critically out of date version?
 eval {
 	require DBD::SQLite;
 	if ( $DBD::SQLite::VERSION < 1.0 ) {
@@ -46,18 +60,22 @@ EOT
 # 2009/04/02
 # But why do we need to use an older, system-installed library?
 # Let's always use the bundled one. -- ISHIGAKI
-
+# 2009/04/03
-require File::Spec;
+# For the moment, while we're fixing things, this is reasonable.
+# However, logic in the form "I lack knowledge, thereforce lets do
+# it this way" is not a sufficiently robust decision making process. 
+# Let's find out the full story first, so we can make an informed
+# decision to whether to do this. -- ADAMK
 my ($force_local, $sqlite_base, $sqlite_lib, $sqlite_inc);
-
+if ( 0 ) {
-=begin dont_try_looking_for_a_buggy_library
+	require File::Spec;
-if ( $sqlite_base = (grep(/SQLITE_LOCATION=.*/, @ARGV))[0] ) {
+	if ( $sqlite_base = (grep(/SQLITE_LOCATION=.*/, @ARGV))[0] ) {
 		$sqlite_base =~ /=(.*)/;
 		$sqlite_base = $1;
 		$sqlite_lib = File::Spec->catdir( $sqlite_base, 'lib'     );
 		$sqlite_inc = File::Spec->catdir( $sqlite_base, 'include' );
-}
+	}
-if ( $force_local = (grep(/USE_LOCAL_SQLITE=.*/, @ARGV))[0] ) {
+	if ( $force_local = (grep(/USE_LOCAL_SQLITE=.*/, @ARGV))[0] ) {
 		$force_local =~ /=(.*)/;
 		$force_local = "$1" ? 1 : 0;
 		if ( $force_local ) {
@@ -65,10 +83,10 @@ if ( $force_local = (grep(/USE_LOCAL_SQLITE=.*/, @ARGV))[0] ) {
 			undef $sqlite_lib;
 			undef $sqlite_inc;
 		}
-}
+	}
 
-# Now check for a compatible sqlite3
+	# Now check for a compatible sqlite3
-unless ( $force_local ) {
+	unless ( $force_local ) {
 		my ($dir, $file, $fh, $version);
 		print "Checking installed SQLite version...\n" if $ENV{AUTOMATED_TESTING};
 		if ( $sqlite_inc ) {
@@ -106,8 +124,8 @@ unless ( $force_local ) {
 		} else {
 			print "Looks good\n" if $ENV{AUTOMATED_TESTING};
 		}
+	}
 }
-=cut
 
 # Use always the bundled one.
 # XXX: ... and this message should be more informative.
@@ -115,7 +133,6 @@ unless ( $force_local ) {
 $force_local = 1;
 print "We're using the bundled sqlite library.\n" if $ENV{AUTOMATED_TESTING};
 
-
 @ARGV = grep( ! /SQLITE_LOCATION|USE_LOCAL_SQLITE/, @ARGV );
 
 
@@ -157,6 +174,21 @@ unless ( $Config{usethreads} ) {
 	push @CC_DEFINE, '-DTHREADSAFE=0';
 }
 
+my @CC_OPTIONS = (
+	INC          => join( ' ', @CC_INC    ),
+	DEFINE       => join( ' ', @CC_DEFINE ),
+	( @CC_LIBS ? (
+		LIBS => join( ' ', @CC_LIBS )
+	) : () ),
+);
+
+
+
+
+
+#####################################################################
+# Hand off to ExtUtils::MakeMaker
+
 WriteMakefile(
 	NAME             => 'DBD::SQLite',
 	ABSTRACT         => 'Self Contained SQLite RDBMS in a DBI Driver',
@@ -165,14 +197,21 @@ WriteMakefile(
 		'DBI'        => '1.21',
 		'Test::More' => '0.42',
 	},
-	( $ExtUtils::MakeMaker::VERSION ge '6.46'? (
+	OPTIONAL( '6.48',
-		'LICENSE'    => 'perl',
+		MIN_PERL_VERSION => '5.005',
-		'META_MERGE' => {
+	),
-			'configure_requires' => {
+	OPTIONAL( '6.31',
-				DBI => '1.21',
+		LICENSE    => 'perl',	
+	),
+	OPTIONAL( '6.46',
+		META_MERGE => {
+			configure_requires => {
+				'ExtUtils::MakeMaker' => '6.48',
+				'File::Spec'          => (WINLIKE ? '3.27' : '0.82'),
+				'DBI'                 => '1.21',
 			},
 		},
-	) : () ),
+	),
 	OBJECT           => ( $force_local ? '$(O_FILES)' : 'SQLite.o dbdimp.o' ),
 	OPTIMIZE         => '-O2',
 	clean            => {
@@ -180,11 +219,8 @@ WriteMakefile(
 	},
 	PL_FILES         => {},
 	EXE_FILES        => [],
-	INC          => join( ' ', @CC_INC    ),
+
-	DEFINE       => join( ' ', @CC_DEFINE ),
+	@CC_OPTIONS,
-	( @CC_LIBS ? (
-		LIBS => join( ' ', @CC_LIBS )
-	) : () ),
 );
 
 package MY;

t/00basic.t

@@ -1,4 +1,11 @@
+#!/usr/bin/perl
+
 use strict;
-use Test::More;
+BEGIN {
-BEGIN { plan tests => 1 }
+	$|  = 1;
-BEGIN { use_ok('DBD::SQLite') }
+	$^W = 1;
+}
+
+use Test::More tests => 1;
+
+use_ok('DBD::SQLite');

t/01logon.t

@@ -1,7 +1,14 @@
+#!/usr/bin/perl
+
 use strict;
-use Test::More;
+BEGIN {
-BEGIN { plan tests => 5 }
+	$|  = 1;
+	$^W = 1;
+}
+
+use Test::More tests => 5;
 use DBI;
+
 my $dbh = DBI->connect("dbi:SQLite:dbname=foo", "", "");
 ok($dbh);
 ok($dbh->{sqlite_version});

t/02cr_table.t

@@ -1,8 +1,14 @@
-$|++;
+#!/usr/bin/perl
+
 use strict;
-use Test::More;
+BEGIN {
-BEGIN { plan tests => 4 }
+	$|  = 1;
+	$^W = 1;
+}
+
+use Test::More tests => 4;
 use DBI;
+
 my $dbh = DBI->connect("dbi:SQLite:dbname=foo", "", "");
 ok($dbh);
 $dbh->{AutoCommit} = 1;

t/03insert.t

@@ -1,7 +1,14 @@
+#!/usr/bin/perl
+
 use strict;
-use Test::More;
+BEGIN {
+	$|  = 1;
+	$^W = 1;
+}
+
+use Test::More tests => 11;
 use DBI;
-BEGIN { plan tests => 11 }
+
 my $dbh = DBI->connect("dbi:SQLite:dbname=foo", "", "", {AutoCommit => 1});
 ok($dbh);
 $dbh->do("CREATE TABLE f (f1, f2, f3)");

t/04select.t

@@ -1,7 +1,14 @@
+#!/usr/bin/perl
+
 use strict;
-use Test::More;
+BEGIN {
-BEGIN { plan tests => 21 }
+	$|  = 1;
+	$^W = 1;
+}
+
+use Test::More tests => 21;
 use DBI;
+
 my $dbh = DBI->connect("dbi:SQLite:dbname=foo", "", "", { RaiseError => 1, AutoCommit => 1 });
 ok($dbh);
 $dbh->do("CREATE TABLE f (f1, f2, f3)");

t/05tran.t

@@ -1,6 +1,13 @@
+#!/usr/bin/perl
+
 use strict;
-use Test::More;
+BEGIN {
-BEGIN { plan tests => 2 }
+	$|  = 1;
+	$^W = 1;
+}
+
+use Test::More tests => 2;
+
 use DBI;
 unlink("foo");
 my $dbh = DBI->connect("dbi:SQLite:dbname=foo", "", "",

t/06error.t

@@ -1,6 +1,12 @@
+#!/usr/bin/perl
+
 use strict;
-use Test::More;
+BEGIN {
-BEGIN { plan tests => 2 }
+	$|  = 1;
+	$^W = 1;
+}
+
+use Test::More tests => 2;
 use DBI;
 
 unlink('foo');

t/07busy.t

@@ -1,8 +1,12 @@
-#!perl
+#!/usr/bin/perl
 
 use strict;
-use Test::More;
+BEGIN {
-BEGIN { plan tests => 8 }
+	$|  = 1;
+	$^W = 1;
+}
+
+use Test::More tests => 8;
 use DBI;
 
 my $db = DBI->connect('dbi:SQLite:foo', '', '', 

t/08create_function.t

@@ -3,6 +3,7 @@
 use strict;
 BEGIN {
 	$|  = 1;
+	$^W = 1;
 }
 
 use Test::More tests => 18;

t/09create_aggregate.t

@@ -1,71 +1,72 @@
+#!/usr/bin/perl
+
 use strict;
-
+BEGIN {
-package count_aggr;
+	$|  = 1;
-
+	$^W = 1;
-sub new {
-    bless { count => 0 }, shift;
 }
 
-sub step {
+use Test::More tests => 15;
+use DBI;
+
+# Create the aggregate test packages
+SCOPE: {
+	package count_aggr;
+
+	sub new {
+		bless { count => 0 }, shift;
+	}
+
+	sub step {
 		$_[0]{count}++;
 		return;
-}
+	}
 
-sub finalize {
+	sub finalize {
 		my $c = $_[0]{count};
 		$_[0]{count} = undef;
 
 		return $c;
-}
+	}
 
-package obj_aggregate;
+	package obj_aggregate;
 
-sub new {
+	sub new {
 		bless { count => 0 }, shift;
-}
+	}
 
-sub step {
+	sub step {
-    $_[0]{count}++
+		$_[0]{count}++ if defined $_[1];
-        if defined $_[1];
+	}
-}
 
-sub finalize {
+	sub finalize {
 		my $c = $_[0]{count};
 		$_[0]{count} = undef;
 		return $c;
-}
+	}
 
-package fail_aggregate;
+	package fail_aggregate;
 
-sub new {
+	sub new {
 		my $class = shift;
 		if ( ref $class ) {
-            die "new() failed on request"
+			die "new() failed on request" if $class->{'fail'} eq 'new';
-              if $class->{'fail'} eq 'new';
+			return undef if $class->{'fail'} eq 'undef';
-            return undef 
-              if $class->{'fail'} eq 'undef';
 			return bless { %$class }, ref $class;
 		} else {
 			return bless { 'fail' => $_[0] }, $class;
 		}
+	}
+
+	sub step {
+		die "step() failed on request" if $_[0]{fail} eq 'step';
+	}
+
+	sub finalize {
+		die "finalize() failed on request" if $_[0]{fail} eq 'finalize';
+	}
 }
 
-sub step {
-    die "step() failed on request"
-        if $_[0]{fail} eq 'step';
-}
-
-sub finalize {
-    die "finalize() failed on request"
-        if $_[0]{fail} eq 'finalize';
-}
-
-package main;
-
-use Test::More;
-BEGIN { plan tests => 15 }
-use DBI;
-
 my $dbh = DBI->connect("dbi:SQLite:dbname=foo", "", "", { PrintError => 0 } );
 ok($dbh);
 

t/10dsnlist.t

@@ -1,12 +1,14 @@
-#!/usr/local/bin/perl
+#!/usr/bin/perl
-#
+
-#   $Id: 10dsnlist.t,v 1.1.1.1 1999/06/13 12:59:35 joe Exp $
-#
 # This test creates a database and drops it. Should be executed
 # after listdsn.
-#
 
 use strict;
+BEGIN {
+	$|  = 1;
+	$^W = 1;
+}
+
 use vars qw($test_dsn $test_user $test_password $mdriver $state);
 
 #

t/11unicode.t

@@ -1,13 +1,13 @@
-#!/usr/local/bin/perl
+#!/usr/bin/perl
-#
+
-#   $Id: 40blobs.t,v 1.5 2004/07/21 20:50:45 matt Exp $
-#
 # This is a test for correct handling of the "unicode" database
 # handle parameter.
-#
 
-$^W = 1;
 use strict;
+BEGIN {
+	$|  = 1;
+	$^W = 1;
+}
 
 #
 #   Include std stuff

t/12create_collation.t

@@ -1,3 +1,11 @@
+#!/usr/bin/perl
+
+use strict;
+BEGIN {
+	$|  = 1;
+	$^W = 1;
+}
+
 BEGIN { 
     local $@;
     unless (eval { require Test::More; require Encode; 1 }) {
@@ -6,7 +14,6 @@ BEGIN {
     }
 }
 
-use strict;
 use Test::More tests => 8;
 use DBI;
 use Encode qw/decode/;

t/13progress_handler.t

@@ -1,6 +1,12 @@
+#!/usr/bin/perl
+
 use strict;
-use Test::More;
+BEGIN {
-BEGIN { plan tests => 3; }
+	$|  = 1;
+	$^W = 1;
+}
+
+use Test::More tests => 3;
 use DBI;
 
 my $N_OPCODES = 50; # how many opcodes before calling the progress handler

t/20createdrop.t

@@ -1,12 +1,14 @@
-#!/usr/local/bin/perl
+#!/usr/bin/perl
-#
+
-#   $Id: 20createdrop.t,v 1.1.1.1 1999/06/13 12:59:35 joe Exp $
-#
 # This is a skeleton test. For writing new tests, take this file
 # and modify/extend it.
-#
 
 use strict;
+BEGIN {
+	$|  = 1;
+	$^W = 1;
+}
+
 use vars qw($test_dsn $test_user $test_password $mdriver $dbdriver);
 $DBI::errstr = '';  # Make -w happy
 require DBI;

t/30insertfetch.t

@@ -1,13 +1,14 @@
-#!/usr/local/bin/perl
+#!/usr/bin/perl
-#
+
-#   $Id: 30insertfetch.t,v 1.1 2002/02/19 17:19:57 matt Exp $
-#
 # This is a simple insert/fetch test.
-#
 
 use strict;
+BEGIN {
+	$|  = 1;
+	$^W = 1;
+}
+
 use vars qw($test_dsn $test_user $test_password $mdriver $state);
-$^W = 1;
 
 #
 #   Make -w happy

t/40bindparam.t

@@ -1,14 +1,12 @@
-#!/usr/local/bin/perl
+#!/usr/bin/perl
-#
-#   $Id: 40bindparam.t,v 1.5 2002/12/29 16:24:55 matt Exp $
-#
-#   This is a skeleton test. For writing new tests, take this file
-#   and modify/extend it.
-#
 
 use strict;
+BEGIN {
+	$|  = 1;
+	$^W = 1;
+}
+
 use vars qw($test_dsn $test_user $test_password $mdriver $state);
-$^W = 1;
 
 #
 #   Make -w happy

t/40blobs.t

@@ -1,15 +1,15 @@
-#!/usr/local/bin/perl
+#!/usr/bin/perl
-#
+
-#   $Id: 40blobs.t,v 1.4 2003/07/31 14:09:16 matt Exp $
-#
 # This is a test for correct handling of BLOBS; namely $dbh->quote
 # is expected to work correctly.
-#
 
 use strict;
-use vars qw($test_dsn $test_user $test_password $mdriver $dbdriver $state);
+BEGIN {
-$^W = 1;
+	$|  = 1;
+	$^W = 1;
+}
 
+use vars qw($test_dsn $test_user $test_password $mdriver $dbdriver $state);
 
 #
 #   Make -w happy

t/40blobtext.t

@@ -1,8 +1,12 @@
-#!/usr/bin/perl -w
+#!/usr/bin/perl
 
 use strict;
-use Test::More;
+BEGIN {
-BEGIN { plan tests => 26 }
+	$|  = 1;
+	$^W = 1;
+}
+
+use Test::More tests => 26;
 use DBI;
 
 unlink('foo', 'foo-journal');

t/40listfields.t

@@ -1,11 +1,13 @@
-#!/usr/local/bin/perl
+#!/usr/bin/perl
-#
+
-#   $Id: 40listfields.t,v 1.1.1.1 1999/06/13 12:59:35 joe Exp $
-#
 # This is a test for statement attributes being present appropriately.
-#
 
 use strict;
+BEGIN {
+	$|  = 1;
+	$^W = 1;
+}
+
 use vars qw($test_dsn $test_user $test_password $mdriver $dbdriver $state $COL_KEY $COL_NULLABLE);
 
 #

t/40nulls.t

@@ -1,9 +1,12 @@
-#!/usr/local/bin/perl
+#!/usr/bin/perl
-#
+
-#   $Id: 40nulls.t,v 1.1.1.1 1999/06/13 12:59:35 joe Exp $
-#
 # This is a test for correctly handling NULL values.
-#
+
+use strict;
+BEGIN {
+	$|  = 1;
+	$^W = 1;
+}
 
 use strict;
 use vars qw($test_dsn $test_user $test_password $mdriver $dbdriver $state);

t/40numrows.t

@@ -1,17 +1,15 @@
-#!/usr/local/bin/perl
+#!/usr/bin/perl
-#
+
-#   $Id: 40numrows.t,v 1.1 2002/02/19 17:19:57 matt Exp $
-#
 # This tests, whether the number of rows can be retrieved.
-#
 
 use strict;
+BEGIN {
+	$|  = 1;
+	$^W = 1;
+}
+
 use vars qw($test_dsn $test_user $test_password $mdriver $state);
 
-$^W = 1;
-$| = 1;
-
-
 #
 #   Make -w happy
 #

t/40prepcached.t

@@ -1,18 +1,17 @@
-#!/usr/local/bin/perl
+#!/usr/bin/perl
-#
+
-#   $Id: 40numrows.t,v 1.2 2003/08/11 21:51:14 matt Exp $
-#
 # This is a regression test for bug #15186:
 # http://rt.cpan.org/Public/Bug/Display.html?id=15186
 # About re-using statements with prepare_cached().
 
 use strict;
+BEGIN {
+	$|  = 1;
+	$^W = 1;
+}
+
 use vars qw($test_dsn $test_user $test_password $mdriver $state);
 
-$^W = 1;
-$| = 1;
-
-
 #
 #   Make -w happy
 #

t/50chopblanks.t

@@ -1,11 +1,12 @@
-#!/usr/local/bin/perl
+#!/usr/bin/perl
-#
+
-#   $Id: 50chopblanks.t,v 1.1 2002/02/19 17:19:57 matt Exp $
+# Check whether 'ChopBlanks' works.
-#
-#   This driver should check whether 'ChopBlanks' works.
-#
 
 use strict;
+BEGIN {
+	$|  = 1;
+	$^W = 1;
+}
 
 #
 #   Make -w happy
@@ -21,7 +22,6 @@ $test_password = '';
 #   Include lib.pl
 #
 use DBI;
-use strict;
 $mdriver = "";
 {
     my $file;

t/50commit.t

@@ -1,16 +1,15 @@
-#!/usr/local/bin/perl
+#!/usr/bin/perl
-#
+
-#   $Id: 50commit.t,v 1.1.1.1 1999/06/13 12:59:35 joe Exp $
-#
 # This is testing the transaction support.
-#
 
 use strict;
+BEGIN {
+	$|  = 1;
+	$^W = 1;
+}
+
 use vars qw($test_dsn $test_user $test_password $mdriver $state);
 
-$^W = 1;
-
-
 #
 #   Include lib.pl
 #

t/60metadata.t

@@ -1,7 +1,14 @@
+#!/usr/bin/perl
+
 use strict;
-use Test::More;
+BEGIN {
-BEGIN { plan tests => 27 }
+	$|  = 1;
+	$^W = 1;
+}
+
+use Test::More tests => 27;
 use DBI;
+
 my $dbh = DBI->connect("dbi:SQLite:dbname=foo", "", "", { });
 ok($dbh);
 $dbh->{PrintError} = 0;

t/70schemachange.t

@@ -1,6 +1,11 @@
-#!/usr/bin/perl -w
+#!/usr/bin/perl
 
 use strict;
+BEGIN {
+	$|  = 1;
+	$^W = 1;
+}
+
 use vars qw($test_dsn $test_user $test_password $mdriver $dbdriver);
 
 if ($^O eq 'MSWin32') {

t/90cppcomments.t

@@ -1,7 +1,15 @@
+#!/usr/bin/perl
+
 use strict;
+BEGIN {
+	$|  = 1;
+	$^W = 1;
+}
+
 use Test::More;
-use DBI;
 use Fatal qw(open);
+use DBI;
+
 my @c_files = <*.c>, <*.xs>;
 plan tests => scalar(@c_files);
 

t/ak-dbd.t

@@ -1,16 +1,10 @@
-#!/usr/local/bin/perl
+#!/usr/bin/perl
-#
-#   $Id: ak-dbd.t,v 1.2 2002/02/19 18:51:01 matt Exp $
-#
-#   This is a skeleton test. For writing new tests, take this file
-#   and modify/extend it.
-#
 
 use strict;
-
+BEGIN {
-$^W = 1;
+	$|  = 1;
-$| = 1;
+	$^W = 1;
-
+}
 
 #
 #   Make -w happy

t/column-info.t

@@ -1,22 +1,12 @@
-#!/usr/bin/perl -w
+#!/usr/bin/perl
-BEGIN { 
+
-    local $@;
-    unless (eval { require Test::More; 1 }) {
-        print "1..0 # Skip need Test::More\n";
-        exit;
-    }
-}
 use strict;
-use Test::More tests => 7;
-
 BEGIN {
-    use_ok 'DBD::SQLite'
+	$|  = 1;
-        or BAIL_OUT 'DBD::SQLite(::Amalgamation) failed to load. No sense in continuing.';
+	$^W = 1;
-    no warnings 'once';
+}
-    #diag "Testing DBD::SQLite version '$DBD::SQLite::VERSION' on DBI '$DBI::VERSION'";
 
-    #*DBD::SQLite::db::column_info = \&DBD::SQLite::db::_sqlite_column_info;
+use Test::More tests => 6;
-};
 use DBI;
 
 my $dbh = DBI->connect('dbi:SQLite:dbname=:memory:',undef,undef,{RaiseError => 1});