diff options
author | Tor Didriksen <tor.didriksen@sun.com> | 2010-06-14 11:23:49 +0200 |
---|---|---|
committer | Tor Didriksen <tor.didriksen@sun.com> | 2010-06-14 11:23:49 +0200 |
commit | f88e6af0bbbba5f7fdf90f6c3401a2c49093a4e9 (patch) | |
tree | 47baecc56be788349386eb169f6f596ad14a9b07 /mysql-test/include/not_parallel.inc | |
parent | 14182ec9176f2b368270cd82a4a3b31b218f9252 (diff) | |
download | mariadb-git-f88e6af0bbbba5f7fdf90f6c3401a2c49093a4e9.tar.gz |
Bug #53261 MTR tests archive_plugin and blackhole_plugin fail when compiling with cmake
Let mtr lookup the plugins, rather than hard-coding autotools lib path.
mysql-test/include/not_parallel.inc:
Add new feature for skipping when running in parallel.
mysql-test/mysql-test-run.pl:
Use find_plugin to locate plugins.
Export opt_parallel in environment.
mysql-test/suite/federated/federated_plugin-master.opt:
Use plugin dir from mtr.
mysql-test/suite/federated/federated_plugin.test:
Skip test, disabled.
mysql-test/t/archive_plugin-master.opt:
Use plugin dir from mtr.
mysql-test/t/archive_plugin.test:
Skip test if running in parallel.
mysql-test/t/blackhole_plugin-master.opt:
Use plugin dir from mtr.
mysql-test/t/blackhole_plugin.test:
Skip test if running in parallel.
Diffstat (limited to 'mysql-test/include/not_parallel.inc')
-rw-r--r-- | mysql-test/include/not_parallel.inc | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/mysql-test/include/not_parallel.inc b/mysql-test/include/not_parallel.inc new file mode 100644 index 00000000000..39432c59813 --- /dev/null +++ b/mysql-test/include/not_parallel.inc @@ -0,0 +1,3 @@ +if (`SELECT '$MTR_PARALLEL' > 1`) { + --skip test requires --parallel=1 +} |