X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=t%2F09sqlt-diagram.t;h=85d559829bf9ce8d6b7eb69e9093aba4c0c0ddbd;hb=2c1e8cab7a9c4f6f5f408aed19dfdc2ec215b6b9;hp=12f724f6f822f41eab35f8f3268df6b00709304a;hpb=401e5c7ccfdda40d5040a00dabe05d0471931232;p=dbsrgits%2FSQL-Translator.git

diff --git a/t/09sqlt-diagram.t b/t/09sqlt-diagram.t
index 12f724f..85d5598 100644
--- a/t/09sqlt-diagram.t
+++ b/t/09sqlt-diagram.t
@@ -1,13 +1,12 @@
-#!/usr/bin/perl
-# vim: set ft=perl:
-
 use strict;
+use warnings;
 
 use File::Spec::Functions qw(catfile updir tmpdir);
 use File::Temp qw(mktemp);
 use FindBin qw($Bin);
 use Test::More;
 use Test::SQL::Translator qw(maybe_plan);
+use Text::ParseWords qw(shellwords);
 
 BEGIN {
     maybe_plan(
@@ -18,22 +17,17 @@ BEGIN {
     );
 }
 
-my @script = qw(blib 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 @script = qw(script sqlt-diagram);
+my @data = qw(data mysql create2.sql);
 
-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');
 
-ok(-e $sqlt_diagram); 
-my @cmd = ($sqlt_diagram, "-d", "MySQL", "-o", $tmp, $test_data);
+ok(-e $sqlt_diagram);
+my @cmd = ($^X, shellwords($ENV{HARNESS_PERL_SWITCHES}||''), $sqlt_diagram, "-d", "MySQL", "-o", $tmp, $test_data);
 eval { system(@cmd); };
 ok(!$@ && ($? == 0));
-ok(-e $tmp); 
+ok(-e $tmp);
 eval { unlink $tmp; };