THROW AWAY this commit on rebase - dirty bootstrap

diff --git a/.gitignore b/.gitignore
index c8cda3e..8d32a72 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -19,3 +19,5 @@ t/var/
 *~
 maint/.Generated_Pod
 examples/Schema/db
+
+t/dqlib

diff --git a/.travis.yml b/.travis.yml
index 1bd9d4d..785a7f0 100644 (file)
--- a/.travis.yml
+++ b/.travis.yml
@@ -65,38 +65,9 @@ perl:
 
 env:
   - CLEANTEST=false
-  - CLEANTEST=true
 
 matrix:
   include:
-    # this particular perl is quite widespread
-    - perl: 5.8.8_thr_mb
-      env:
-        - CLEANTEST=true
-        - BREWOPTS="-Duseithreads -Dusemorebits"
-        - BREWVER=5.8.8
-
-    # so is this one (test a sane CPAN.pm)
-    - perl: 5.12.4_thr_mb
-      env:
-        - CLEANTEST=true
-        - BREWOPTS="-Duseithreads -Dusemorebits"
-        - BREWVER=5.12.4
-
-    # this is the perl suse ships
-    - perl: 5.10.0_thr_dbg
-      env:
-        - CLEANTEST=true
-        - BREWOPTS="-DDEBUGGING -Duseithreads"
-        - BREWVER=5.10.0
-
-    # CLEANTEST of minimum supported
-    - perl: 5.8.3_nt_mb
-      env:
-        - CLEANTEST=true
-        - BREWOPTS="-Dusemorebits"
-        - BREWVER=5.8.3
-
     # Full Test of minimum supported with threads
     - perl: 5.8.5_thr
       env:
@@ -105,14 +76,6 @@ matrix:
         - BREWVER=5.8.5
         - DBIC_TRACE_PROFILE=console
 
-    # Full Test of minimum supported without threads
-    - perl: 5.8.3_nt
-      env:
-        - CLEANTEST=false
-        - BREWOPTS=""
-        - BREWVER=5.8.3
-        - DBIC_TRACE_PROFILE=console_monochrome
-
     ###
     # some permutations of tracing and envvar poisoning
 
@@ -145,46 +108,6 @@ matrix:
         - DBIC_TRACE=1
         - DBIC_TRACE_PROFILE=console_monochrome
 
-    ###
-    # Start of the allow_failures block
-
-    # recentish stable with blead CPAN
-    - perl: devcpan_5.18.1_thr_mb
-      env:
-        - CLEANTEST=false
-        - BREWOPTS="-Duseithreads -Dusemorebits"
-        - BREWVER=5.18.1
-        - DEVREL_DEPS=true
-
-    # bleadperl with stock CPAN
-    - perl: bleadperl_thr_mb
-      env:
-        - CLEANTEST=false
-        - BREWOPTS="-Duseithreads -Dusemorebits"
-        - BREWVER=blead
-
-    # bleadperl with blead CPAN
-    - perl: devcpan_bleadperl_thr_mb
-      env:
-        - CLEANTEST=false
-        - BREWOPTS="-Duseithreads -Dusemorebits"
-        - BREWVER=blead
-        - DEVREL_DEPS=true
-
-
-  # which ones of the above can fail
-  allow_failures:
-
-    # Fails tests because of https://github.com/Perl-Toolchain-Gang/CPAN-Meta/issues/25
-    # Can't be simply masked due to https://rt.cpan.org/Ticket/Display.html?id=88903
-    - perl: 5.10.0_thr_dbg
-
-    # these run with various dev snapshots - allowed to fail
-    - perl: devcpan_5.18.1_thr_mb
-    - perl: bleadperl_thr_mb
-    - perl: devcpan_bleadperl_thr_mb
-
-
 # sourcing the files is *EXTREMELY* important - otherwise
 # no envvars will survive
 

diff --git a/Makefile.PL b/Makefile.PL
index c3cebfa..f22f9ee 100644 (file)
--- a/Makefile.PL
+++ b/Makefile.PL
@@ -5,6 +5,33 @@ use 5.008001;
 use inc::Module::Install 1.06;
 
 ##
+## TEMPORARY (and non-portable)
+## Get the dq stuff
+##
+`rm -rf t/dqlib`;
+`mkdir t/dqlib`;
+for (
+  [ 'Data-Query' => 'master' ],
+  [ 'SQL-Abstract' => 'dq' ],
+) {
+  my $tdir = '/tmp/dqlib_tmp_clone';
+
+  `rm -rf $tdir`;
+
+  `GIT_SSH=maint/careless_ssh.bash git clone --quiet git://git.shadowcat.co.uk/dbsrgits/$_->[0] $tdir`;
+  printf "\nIncluding %s git rev %s\n",
+    $_->[0],
+    scalar `GIT_DIR=$tdir/.git git rev-parse origin/$_->[1]`,
+  ;
+  `git archive --format=tar --remote=file://$tdir origin/$_->[1] lib/ | tar --strip-components=1 -xC t/dqlib`;
+
+  `rm -rf $tdir`;
+}
+`cpanm SQL::ReservedWords 2>&1`;
+use lib 't/dqlib';
+
+
+##
 ## DO NOT USE THIS HACK IN YOUR DISTS!!! (it makes #toolchain sad)
 ##
 # get cpanX --installdeps . to behave in a checkout (most users do not expect

diff --git a/maint/careless_ssh.bash b/maint/careless_ssh.bash
new file mode 100755 (executable)
index 0000000..1b9e0bc
--- /dev/null
+++ b/maint/careless_ssh.bash
@@ -0,0 +1,3 @@
+#!/bin/bash
+
+/usr/bin/ssh -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no "$@"

diff --git a/maint/travis-ci_scripts/30_before_script.bash b/maint/travis-ci_scripts/30_before_script.bash
index 44218a6..93d5c71 100755 (executable)
--- a/maint/travis-ci_scripts/30_before_script.bash
+++ b/maint/travis-ci_scripts/30_before_script.bash
@@ -62,7 +62,7 @@ else
   parallel_installdeps_notest Test::Warn B::Hooks::EndOfScope Test::Differences HTTP::Status
   parallel_installdeps_notest Test::Pod::Coverage Test::EOL Devel::GlobalDestruction Sub::Name MRO::Compat Class::XSAccessor URI::Escape HTML::Entities
   parallel_installdeps_notest YAML LWP Class::Trigger JSON::XS DBI DateTime::Format::Builder Class::Accessor::Grouped Package::Variant
-  parallel_installdeps_notest Moose Module::Install JSON SQL::Translator File::Which
+  parallel_installdeps_notest Moose Module::Install JSON SQL::Translator File::Which indirect multidimensional bareword::filehandles
 
   if [[ -n "DBICTEST_FIREBIRD_DSN" ]] ; then
     # the official version is very much outdated and does not compile on 5.14+

diff --git a/t/02_standalone_test_classes.t b/t/02_standalone_test_classes.t
index 48c70ac..1e2aa4a 100644 (file)
--- a/t/02_standalone_test_classes.t
+++ b/t/02_standalone_test_classes.t
@@ -5,6 +5,7 @@ use Test::More;
 use File::Find;
 
 use lib 't/lib';
+use lib 't/dqlib';
 
 find({
   wanted => sub {

diff --git a/t/53lean_startup.t b/t/53lean_startup.t
index 6491cf5..f2635c5 100644 (file)
--- a/t/53lean_startup.t
+++ b/t/53lean_startup.t
@@ -64,6 +64,8 @@ use strict;
 use warnings;
 use Test::More;
 
+use lib 't/dqlib';
+
 BEGIN {
   plan skip_all => 'A defined PERL5OPT may inject extra deps crashing this test'
     if $ENV{PERL5OPT};

diff --git a/t/73oracle_hq.t b/t/73oracle_hq.t
index 8189479..0519c13 100644 (file)
--- a/t/73oracle_hq.t
+++ b/t/73oracle_hq.t
@@ -3,8 +3,11 @@ use warnings;
 
 use Test::Exception;
 use Test::More;
-use DBIx::Class::Optional::Dependencies ();
+
 use lib qw(t/lib);
+use DBICTest;
+
+use DBIx::Class::Optional::Dependencies ();
 use DBICTest::RunMode;
 use DBIC::SqlMakerTest;
 

diff --git a/t/lib/DBICTest.pm b/t/lib/DBICTest.pm
index 42a691b..0446830 100644 (file)
--- a/t/lib/DBICTest.pm
+++ b/t/lib/DBICTest.pm
@@ -3,6 +3,9 @@ package # hide from PAUSE
 
 use strict;
 use warnings;
+
+use lib 't/dqlib';
+
 use DBICTest::RunMode;
 use DBICTest::Schema;
 use DBICTest::Util::LeakTracer qw/populate_weakregistry assert_empty_weakregistry/;

diff --git a/t/resultset/update_delete.t b/t/resultset/update_delete.t
index 340bb41..284a84b 100644 (file)
--- a/t/resultset/update_delete.t
+++ b/t/resultset/update_delete.t
@@ -2,6 +2,7 @@ use strict;
 use warnings;
 
 use lib qw(t/lib);
+use lib qw(t/dqlib);
 use Test::More;
 use Test::Exception;