From b3223453f7e4398ff0f55471ac7dc4aecf2caf8d Mon Sep 17 00:00:00 2001 From: Sergei Golubchik Date: Wed, 19 Oct 2011 23:01:15 +0200 Subject: post-merge changes to the mysql-test suite mysql-test/include/check_ipv6.inc: don't try to connect to ipv6 address - the server isn't necessarily listening (e.g. a master doesn't, but a slave does. or vice versa) mysql-test/include/default_mysqld.cnf: move hard-coded values from ConfigFactory.pm to a template. really disable syncs mysql-test/include/have_archive_plugin.inc: wrong test. plugin is loaded in the test, it cannot be available before it mysql-test/include/have_blackhole_plugin.inc: wrong test. plugin is loaded in the test, it cannot be available before it mysql-test/include/have_federated_plugin.inc: wrong test. plugin is loaded in the test, it cannot be available before it mysql-test/lib/My/ConfigFactory.pm: move hard-coded values from ConfigFactory.pm to a template. really disable syncs mysql-test/mysql-test-run.pl: formatting mysql-test/suite/funcs_1/t/is_engines_federated.opt: federated can be a plugin mysql-test/suite/innodb/suite.pm: don't load xtradb plugin in embedded server - it lacks some symbols that xtradb needs mysql-test/suite/unit/suite.pm: don't run unit tests in --embedded-server (for simplicity and speed) --- mysql-test/suite/unit/suite.pm | 1 + 1 file changed, 1 insertion(+) (limited to 'mysql-test/suite/unit') diff --git a/mysql-test/suite/unit/suite.pm b/mysql-test/suite/unit/suite.pm index 7d843200ad1..78d82ccb31d 100644 --- a/mysql-test/suite/unit/suite.pm +++ b/mysql-test/suite/unit/suite.pm @@ -28,6 +28,7 @@ sub start_test { } { + return "Not run for embedded server" if $::opt_embedded_server; return "Not configured to run ctest" unless -f "../CTestTestfile.cmake"; my ($ctest_vs)= $opt_vs_config ? "--build-config $opt_vs_config" : ""; my (@ctest_list)= `cd .. && ctest $opt_vs_config --show-only --verbose`; -- cgit v1.2.1