From: Mayank Prasad Date: June 16 2011 1:55pm Subject: bzr commit into mysql-5.5 branch (mayank.prasad:3458) Bug#12561297 List-Archive: http://lists.mysql.com/commits/139341 X-Bug: 12561297 Message-Id: <201106161355.p5GDtPa0029367@acsmt356.oracle.com> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============0045745387==" --===============0045745387== MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Content-Disposition: inline #At file:///home/mayank/mysql-tree/mydefects/5.5_12561297/ based on revid:vasil.dimov@stripped 3458 Mayank Prasad 2011-06-16 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 when mysql is installed at .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. modified: mysql-test/mysql-test-run.pl mysql-test/t/disabled.def mysql-test/t/mysql_embedded.test === modified file 'mysql-test/mysql-test-run.pl' --- a/mysql-test/mysql-test-run.pl 2011-05-30 13:55:44 +0000 +++ b/mysql-test/mysql-test-run.pl 2011-06-16 13:55:11 +0000 @@ -171,6 +171,7 @@ our $exe_mysql; our $exe_mysqladmin; our $exe_mysqltest; our $exe_libtool; +our $exe_mysql_embedded; our $opt_big_test= 0; @@ -1950,6 +1951,8 @@ sub executable_setup () { $exe_mysqladmin= mtr_exe_exists("$path_client_bindir/mysqladmin"); $exe_mysql= mtr_exe_exists("$path_client_bindir/mysql"); + $exe_mysql_embedded= mtr_exe_maybe_exists("$basedir/libmysqld/examples/mysql_embedded"); + if ( ! $opt_skip_ndbcluster ) { # Look for single threaded NDB @@ -2354,6 +2357,7 @@ sub environment_setup { $ENV{'MYSQLADMIN'}= native_path($exe_mysqladmin); $ENV{'MYSQL_CLIENT_TEST'}= mysql_client_test_arguments(); $ENV{'EXE_MYSQL'}= $exe_mysql; + $ENV{'MYSQL_EMBEDDED'}= $exe_mysql_embedded; # ---------------------------------------------------- # bug25714 executable may _not_ exist in === modified file 'mysql-test/t/disabled.def' --- a/mysql-test/t/disabled.def 2011-06-15 03:03:13 +0000 +++ b/mysql-test/t/disabled.def 2011-06-16 13:55:11 +0000 @@ -16,4 +16,3 @@ alter_table-big : Bug#11748731 create-big : Bug#11748731 2010-11-15 mattiasj was not tested archive-big : Bug#11817185 2011-03-10 Anitha Disabled since this leads to timeout on Solaris Sparc log_tables-big : Bug#11756699 2010-11-15 mattiasj report already exists -mysql_embedded : Bug#12561297 2011-06-15 New test failing on all platforms === modified file 'mysql-test/t/mysql_embedded.test' --- a/mysql-test/t/mysql_embedded.test 2011-06-13 18:41:24 +0000 +++ b/mysql-test/t/mysql_embedded.test 2011-06-16 13:55:11 +0000 @@ -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' --===============0045745387== MIME-Version: 1.0 Content-Type: text/bzr-bundle; charset="us-ascii"; name="bzr/mayank.prasad@stripped" Content-Transfer-Encoding: 7bit Content-Disposition: inline # Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: mayank.prasad@stripped\ # e39o498qmchkje1j # target_branch: file:///home/mayank/mysql-tree/mydefects\ # /5.5_12561297/ # testament_sha1: f3ff24c293f8e3f80ac2e479669f22a6e37f336c # timestamp: 2011-06-16 19:25:19 +0530 # base_revision_id: vasil.dimov@stripped\ # dlcfra64wsz7qfdd # # Begin bundle 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 i7kinChIOF/PY4A= --===============0045745387==--