mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-16 03:52:35 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

mysql-test:

Browse source 
* rename "xtradb" combination to be called "innodb"
* disable xtradb_plugin embedded tests (because of RECOMPILE_FOR_EMBEDDED)
This commit is contained in:
Sergei Golubchik 2013-12-22 17:10:47 +01:00
parent 8e72ddbb9c
commit 0562261336
3 changed files with 9 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
mysql-test/include/have_innodb.combinations
View file

@ -24,7 +24,7 @@ innodb-sys-foreign
innodb-sys-foreign-col innodb-sys-foreign-col
innodb-metrics innodb-metrics
[xtradb] [innodb]
innodb innodb
innodb-cmpmem innodb-cmpmem
innodb-trx innodb-trx

3
mysql-test/include/have_xtradb.combinations
View file

@ -5,12 +5,9 @@ innodb
innodb-cmpmem innodb-cmpmem
innodb-trx innodb-trx
innodb-sys-index innodb-sys-index
loose-xtradb-admin-command
[xtradb] [xtradb]
innodb innodb
innodb-cmpmem innodb-cmpmem
innodb-trx innodb-trx
innodb-sys-index innodb-sys-index
loose-xtradb-admin-command

10
mysql-test/suite.pm
View file

@ -8,8 +8,14 @@ sub skip_combinations {
# disable innodb/xtradb combinatons for configurations that were not built # disable innodb/xtradb combinatons for configurations that were not built
push @combinations, 'innodb_plugin' unless $ENV{HA_INNODB_SO}; push @combinations, 'innodb_plugin' unless $ENV{HA_INNODB_SO};
push @combinations, 'xtradb_plugin' unless $ENV{HA_XTRADB_SO};
push @combinations, 'xtradb' unless $::mysqld_variables{'innodb'} eq "ON"; # if something is compiled in, it's innodb. xtradb is MODULE_ONLY:
push @combinations, 'innodb' unless $::mysqld_variables{'innodb'} eq "ON";
push @combinations, 'xtradb';
# XtraDB is RECOMPILE_FOR_EMBEDDED, ha_xtradb.so cannot work with embedded server
push @combinations, 'xtradb_plugin' if not $ENV{HA_XTRADB_SO}
or $::opt_embedded_server;
my %skip = ( 'include/have_innodb.combinations' => [ @combinations ], my %skip = ( 'include/have_innodb.combinations' => [ @combinations ],
'include/have_xtradb.combinations' => [ @combinations ]); 'include/have_xtradb.combinations' => [ @combinations ]);