diff options
| author | Sergei Golubchik <sergii@pisem.net> | 2012-02-23 09:24:11 +0100 |
|---|---|---|
| committer | Sergei Golubchik <sergii@pisem.net> | 2012-02-23 09:24:11 +0100 |
| commit | e293bdb2c19cacad91d4f5a846568ac595b3a48e (patch) | |
| tree | 503b3836e5ba4ef1d0f0a407ae407fa9d7edb490 /mysql-test/suite.pm | |
| parent | 3cda92aece63a1d1d7f0f37e0e6c2535d2022e62 (diff) | |
| download | mariadb-git-e293bdb2c19cacad91d4f5a846568ac595b3a48e.tar.gz | |
instead of having win/notwin tests that only differ in results,
use one test with two combinations (win/unix), where only one is enabled.
Apply this technique to mysqld--help.
Diffstat (limited to 'mysql-test/suite.pm')
| -rw-r--r-- | mysql-test/suite.pm | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/mysql-test/suite.pm b/mysql-test/suite.pm index 9db2c96a7c5..7c234afffb1 100644 --- a/mysql-test/suite.pm +++ b/mysql-test/suite.pm @@ -1,4 +1,5 @@ package My::Suite::Main; +use My::Platform; @ISA = qw(My::Suite); @@ -13,6 +14,9 @@ sub skip_combinations { my %skip = ( 'include/have_innodb.combinations' => [ @combinations ], 'include/have_xtradb.combinations' => [ @combinations ]); + # don't run tests for the wrong platform + $skip{'include/platform.combinations'} = [ (IS_WINDOWS) ? 'unix' : 'win' ]; + # as a special case, disable certain include files as a whole $skip{'include/not_embedded.inc'} = 'Not run for embedded server' if $::opt_embedded_server; |