diff options
author | Mayank Prasad <mayank.prasad@oracle.com> | 2011-06-16 19:25:11 +0530 |
---|---|---|
committer | Mayank Prasad <mayank.prasad@oracle.com> | 2011-06-16 19:25:11 +0530 |
commit | 5adeda3ae6dbf3b6b0b548b8a72cc4cb896784f9 (patch) | |
tree | ffc25dd07c2a66a1d62af21ac1df8915654ae6e0 /mysql-test/t/mysql_embedded.test | |
parent | 1ba283a9c1ccfe059a7ee02c50fda3c4c84ad216 (diff) | |
download | mariadb-git-5adeda3ae6dbf3b6b0b548b8a72cc4cb896784f9.tar.gz |
BUG#12561297:LIBMYSQLD/EXAMPLE/MYSQL_EMBEDDED IS ABORTING.
Issue:
------
New test case mysql_embedded.test was failing on pb2.
Description:
------------
To run this test case executable libmysqld/examples/mysql_embedded is required.
But as per /libmysqld/examples/cmake_install.cmake this executable doesn't get
copied to <install_dir> when mysql is installed at <install_dir>.That is the
reason it was passing in my local branch and failed on pb2 when pushed.
Solution;
---------
Added code in mysql-test-run.pl, which will try to see if this file exists.If
It doesn't exist, test case will be skipped with a skip message. New code in
mysql-test-run.pl looks only for directory libmysqld/examples/mysql_embedded
because this is the only place where this file could/does exist.
mysql-test/mysql-test-run.pl:
Added new variable for mysql_embedded executable.
mysql-test/t/disabled.def:
enabled mysql_embedded.test which was disabled earlier.
mysql-test/t/mysql_embedded.test:
Modified test case to first verify if mysql_embedded executable exists. If
it does not, skip the test.
Diffstat (limited to 'mysql-test/t/mysql_embedded.test')
-rw-r--r-- | mysql-test/t/mysql_embedded.test | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/mysql-test/t/mysql_embedded.test b/mysql-test/t/mysql_embedded.test index b4c8c6be05f..30959b83017 100644 --- a/mysql-test/t/mysql_embedded.test +++ b/mysql-test/t/mysql_embedded.test @@ -3,4 +3,10 @@ --echo # --source include/is_embedded.inc ---exec $MYSQL_TEST_DIR/../libmysqld/examples/mysql_embedded -e 'select 1' + +# Test case require mysql_embedded to be present +if(!$MYSQL_EMBEDDED) +{ + --skip Test requires mysql_embedded executable +} +--exec $MYSQL_EMBEDDED -e 'select 1' |