(optdeps) Skip-spec brainfart in offline mysql/pg test specs

The _-prefix played a role in an earlier deficient implementation, which
was later thrown away. Make the relevant tests require-lines saner

diff --git a/lib/DBIx/Class/Optional/Dependencies.pm b/lib/DBIx/Class/Optional/Dependencies.pm
index e56ffd8..d7996b8 100644 (file)
--- a/lib/DBIx/Class/Optional/Dependencies.pm
+++ b/lib/DBIx/Class/Optional/Dependencies.pm
@@ -246,8 +246,7 @@ my $dbic_reqs = {
 
   # centralize the specification, as we have ICDT tests which can
   # test the full behavior of RDBMS-specific ICDT on top of bare SQLite
-  # not _-prefixed so that it will show up under req_group_list
-  icdt_pg => {
+  _icdt_pg_base => {
     augment => {
       icdt => {
         req => {
@@ -257,8 +256,12 @@ my $dbic_reqs = {
     },
   },
 
+  icdt_pg => {
+    include => [qw( icdt _icdt_pg_base )],
+  },
+
   rdbms_pg => {
-    include => 'icdt_pg',
+    include => '_icdt_pg_base',
     req => {
       # when changing this list make sure to adjust xt/optional_deps.t
       'DBD::Pg' => 0,
@@ -322,8 +325,7 @@ my $dbic_reqs = {
 
   # centralize the specification, as we have ICDT tests which can
   # test the full behavior of RDBMS-specific ICDT on top of bare SQLite
-  # not _-prefixed so that it will show up under req_group_list
-  icdt_mysql => {
+  _icdt_mysql_base => {
     augment => {
       icdt => {
         req => {
@@ -333,8 +335,12 @@ my $dbic_reqs = {
     },
   },
 
+  icdt_mysql => {
+    include => [qw( icdt _icdt_mysql_base )],
+  },
+
   rdbms_mysql => {
-    include => 'icdt_mysql',
+    include => '_icdt_mysql_base',
     req => {
       'DBD::mysql' => 0,
     },

diff --git a/t/icdt/offline_mysql.t b/t/icdt/offline_mysql.t
index ff2d029..11302b8 100644 (file)
--- a/t/icdt/offline_mysql.t
+++ b/t/icdt/offline_mysql.t
@@ -1,4 +1,4 @@
-use DBIx::Class::Optional::Dependencies -skip_all_without => qw( icdt icdt_mysql );
+use DBIx::Class::Optional::Dependencies -skip_all_without => qw( icdt_mysql );
 
 use strict;
 use warnings;

diff --git a/t/icdt/offline_pg.t b/t/icdt/offline_pg.t
index 9a49aa8..0a04be6 100644 (file)
--- a/t/icdt/offline_pg.t
+++ b/t/icdt/offline_pg.t
@@ -1,4 +1,4 @@
-use DBIx::Class::Optional::Dependencies -skip_all_without => qw( icdt icdt_pg );
+use DBIx::Class::Optional::Dependencies -skip_all_without => qw( icdt_pg );
 
 use strict;
 use warnings;