X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=t%2F51threads.t;h=ae3addc49af6a337beee99f7bab8fb4c26fedfa9;hb=26c663f1;hp=6dc0d11a5d6e525c190997465d6fc9433def9cbb;hpb=a2f228547345e788da5a047024c41f83513e92b8;p=dbsrgits%2FDBIx-Class.git diff --git a/t/51threads.t b/t/51threads.t index 6dc0d11..ae3addc 100644 --- a/t/51threads.t +++ b/t/51threads.t @@ -4,9 +4,16 @@ BEGIN { print "1..0 # SKIP your perl does not support ithreads\n"; exit 0; } + + if ($INC{'Devel/Cover.pm'}) { + print "1..0 # SKIP Devel::Cover does not work with threads yet\n"; + exit 0; + } } use threads; +use DBIx::Class::Optional::Dependencies -skip_all_without => 'test_rdbms_pg'; + use strict; use warnings; @@ -14,19 +21,11 @@ use Test::More; use Test::Exception; plan skip_all => 'DBIC does not actively support threads before perl 5.8.5' - if $] < '5.008005'; + if "$]" < 5.008005; -use DBIx::Class::Optional::Dependencies (); use lib qw(t/lib); use DBICTest; -plan skip_all => 'Test needs ' . DBIx::Class::Optional::Dependencies->req_missing_for ('rdbms_pg') - unless DBIx::Class::Optional::Dependencies->req_ok_for ('rdbms_pg'); - -my ($dsn, $user, $pass) = @ENV{map { "DBICTEST_PG_${_}" } qw/DSN USER PASS/}; -plan skip_all => 'Set $ENV{DBICTEST_PG_DSN}, _USER and _PASS to run this test' - . ' (note: creates and drops a table named artist!)' unless ($dsn && $user); - # README: If you set the env var to a number greater than 10, # we will use that many children my $num_children = $ENV{DBICTEST_THREAD_STRESS} || 1; @@ -34,7 +33,7 @@ if($num_children !~ /^[0-9]+$/ || $num_children < 10) { $num_children = 10; } -use_ok('DBICTest::Schema'); +my ($dsn, $user, $pass) = @ENV{map { "DBICTEST_PG_${_}" } qw/DSN USER PASS/}; my $schema = DBICTest::Schema->connect($dsn, $user, $pass, { AutoCommit => 1, RaiseError => 1, PrintError => 0 });