Fix a couple of tests and add forgotten dependency

diff --git a/Changes b/Changes
index 73bf196..38681b6 100644 (file)
--- a/Changes
+++ b/Changes
@@ -1,7 +1,8 @@
 # ----------------------------------------------------------
 # x.xxxxx xxxx-xx-xx
 # ----------------------------------------------------------
-
+* Adjust two tests so they pass under prove -l
+* Add missing dependency on IO::Scalar
 
 # ----------------------------------------------------------
 # 0.09005 2009-06-08

diff --git a/MANIFEST.SKIP b/MANIFEST.SKIP
index d4202f4..45a37c0 100644 (file)
--- a/MANIFEST.SKIP
+++ b/MANIFEST.SKIP
@@ -27,6 +27,7 @@ Build$
 ^_build/
 
 # Makemaker generated files and dirs.
+\bMETA\.yml
 \bMANIFEST\.bak
 \bMakefile$
 \bblib/

diff --git a/Makefile.PL b/Makefile.PL
index 45eaa98..7d6b752 100644 (file)
--- a/Makefile.PL
+++ b/Makefile.PL
@@ -8,8 +8,9 @@ my $deps = {
     'Class::Data::Inheritable' => 0.02,
     'Class::MakeMethods'       => 0,
     'Digest::SHA1'             => 2.00,
-    'Carp::Clan',              => 0,
+    'Carp::Clan'               => 0,
     'IO::Dir'                  => 0,
+    'IO::Scalar'               => 2.110,
     'Parse::RecDescent'        => 1.096000,   # PBP ftw
     'Pod::Usage'               => 0,
     'Class::Accessor::Fast'    => 0,
@@ -63,12 +64,12 @@ for my $type (qw/requires recommends test_requires/) {
 tests_recursive ();
 
 install_script (qw|
-  bin/sqlt-diagram
-  bin/sqlt-diff
-  bin/sqlt-diff-old
-  bin/sqlt-dumper
-  bin/sqlt-graph
-  bin/sqlt
+  script/sqlt-diagram
+  script/sqlt-diff
+  script/sqlt-diff-old
+  script/sqlt-dumper
+  script/sqlt-graph
+  script/sqlt
 |);
 
 install_share();

diff --git a/bin/sqlt b/script/sqlt
similarity index 100%
rename from bin/sqlt
rename to script/sqlt

diff --git a/bin/sqlt-diagram b/script/sqlt-diagram
similarity index 100%
rename from bin/sqlt-diagram
rename to script/sqlt-diagram

diff --git a/bin/sqlt-diff b/script/sqlt-diff
similarity index 100%
rename from bin/sqlt-diff
rename to script/sqlt-diff

diff --git a/bin/sqlt-diff-old b/script/sqlt-diff-old
similarity index 100%
rename from bin/sqlt-diff-old
rename to script/sqlt-diff-old

diff --git a/bin/sqlt-dumper b/script/sqlt-dumper
similarity index 100%
rename from bin/sqlt-dumper
rename to script/sqlt-dumper

diff --git a/bin/sqlt-graph b/script/sqlt-graph
similarity index 100%
rename from bin/sqlt-graph
rename to script/sqlt-graph

diff --git a/bin/sqlt.cgi b/script/sqlt.cgi
similarity index 100%
rename from bin/sqlt.cgi
rename to script/sqlt.cgi

diff --git a/t/09sqlt-diagram.t b/t/09sqlt-diagram.t
index 12f724f..6935c51 100644 (file)
--- a/t/09sqlt-diagram.t
+++ b/t/09sqlt-diagram.t
@@ -1,7 +1,5 @@
-#!/usr/bin/perl
-# vim: set ft=perl:
-
 use strict;
+use warnings;
 
 use File::Spec::Functions qw(catfile updir tmpdir);
 use File::Temp qw(mktemp);
@@ -18,16 +16,11 @@ BEGIN {
     );
 }
 
-my @script = qw(blib script sqlt-diagram);
+my @script = qw(script sqlt-diagram);
 my @data = qw(data mysql Apache-Session-MySQL.sql);
 
-my $sqlt_diagram = (-d "blib")
-    ? catfile($Bin, updir, @script)
-    : catfile($Bin, @script);
-
-my $test_data = (-d "t")
-    ? catfile($Bin, @data)
-    : catfile($Bin, "t", @data);
+my $sqlt_diagram = catfile($Bin, updir, @script);
+my $test_data = catfile($Bin, @data);
 
 my $tmp = mktemp('sqlXXXXX');
 

diff --git a/t/30sqlt-diff.t b/t/30sqlt-diff.t
index 8a34d4a..4b9c3a4 100644 (file)
--- a/t/30sqlt-diff.t
+++ b/t/30sqlt-diff.t
@@ -8,21 +8,13 @@ use FindBin qw($Bin);
 use Test::More;
 use Test::SQL::Translator qw(maybe_plan);
 
-my @script = qw(blib script sqlt-diff-old);
+my @script = qw(script sqlt-diff-old);
 my @create1 = qw(data sqlite create.sql);
 my @create2 = qw(data sqlite create2.sql);
 
-my $sqlt_diff = (-d "blib")
-    ? catfile($Bin, updir, @script)
-    : catfile($Bin, @script);
-
-my $create1 = (-d "t")
-    ? catfile($Bin, @create1)
-    : catfile($Bin, "t", @create1);
-
-my $create2 = (-d "t")
-    ? catfile($Bin, @create2)
-    : catfile($Bin, "t", @create2);
+my $sqlt_diff = catfile($Bin, updir, @script);
+my $create1 = catfile($Bin, @create1);
+my $create2 = catfile($Bin, @create2);
 
 BEGIN {
     maybe_plan(21,