(travis) Port all travis changes since last release

[dbsrgits/DBIx-Class.git] / t / storage / quote_names.t

diff --git a/t/storage/quote_names.t b/t/storage/quote_names.t
index bf46122..ac65fa0 100644 (file)
--- a/t/storage/quote_names.t
+++ b/t/storage/quote_names.t
@@ -89,7 +89,9 @@ my %dbs = (
 );
 
 # lie that we already locked stuff - the tests below do not touch anything
-$ENV{DBICTEST_LOCK_HOLDER} = -1;
+# unless we are under travis, where the OOM killers reign and things are rough
+$ENV{DBICTEST_LOCK_HOLDER} = -1
+  unless DBICTest::RunMode->is_ci;
 
 # Make sure oracle is tried last - some clients (e.g. 10.2) have symbol
 # clashes with libssl, and will segfault everything coming after them
@@ -130,7 +132,7 @@ for my $db (sort {
   # if something was produced - it better be quoted
   if (
     # the SQLT producer has no idea what quotes are :/
-    $db ne 'SYBASE'
+    ! grep { $db eq $_ } qw( SYBASE DB2 )
       and
     my $ddl = try { $schema->deployment_statements }
   ) {