From: Bjorn Munch Date: March 15 2011 3:07pm Subject: bzr commit into mysql-5.1-mtr branch (bjorn.munch:2987) Bug#11762804 List-Archive: http://lists.mysql.com/commits/133046 X-Bug: 11762804 Message-Id: <201103151507.p2FF7Tsw022333@khepri15.norway.sun.com> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============0369751603==" --===============0369751603== MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Content-Disposition: inline #At file:///home/bm136801/my/crashrep-51/ based on revid:bjorn.munch@stripped 2987 Bjorn Munch 2011-03-15 Bug #11762804 55442: MYSQLD DEBUG CRASHES WHILE RUNNING MYISAM_CRASH_BEFORE_FLUSH_KEYS.TEST This will cause affected tests to skip if CrashReporter would popup Found 5 tests that needed modification added: mysql-test/include/not_crashrep.inc modified: mysql-test/suite/binlog/t/binlog_index.test mysql-test/suite/innodb/t/innodb_bug53756.test mysql-test/suite/innodb_plugin/t/innodb_bug53756.test mysql-test/t/crash_commit_before.test mysql-test/t/myisam_crash_before_flush_keys.test === added file 'mysql-test/include/not_crashrep.inc' --- a/mysql-test/include/not_crashrep.inc 1970-01-01 00:00:00 +0000 +++ b/mysql-test/include/not_crashrep.inc 2011-03-15 15:06:59 +0000 @@ -0,0 +1,24 @@ +# Check if CrashReporter is enabled and would open a window + +perl; +sub skip_test { + # Only relevant on Mac OS X + return 0 unless $^O eq 'darwin'; + my $crep= `defaults read com.apple.CrashReporter DialogType`; + return 0 if $?; + chomp ($crep); + $crep= lc $crep; + return ($crep eq 'basic' || $crep eq 'developer'); +} +my $skip= skip_test(); +open (F, ">" . $ENV{'MYSQL_TMP_DIR'} . "/crashrep.inc"); +print F "let \$crashrep= $skip;\n"; +close F; +EOF + +--source $MYSQL_TMP_DIR/crashrep.inc +--remove_file $MYSQL_TMP_DIR/crashrep.inc + +if ($crashrep) { + --skip CrashReporter would popup a window +} === modified file 'mysql-test/suite/binlog/t/binlog_index.test' --- a/mysql-test/suite/binlog/t/binlog_index.test 2010-12-17 01:17:03 +0000 +++ b/mysql-test/suite/binlog/t/binlog_index.test 2011-03-15 15:06:59 +0000 @@ -6,6 +6,8 @@ source include/not_embedded.inc; # Don't test this under valgrind, memory leaks will occur --source include/not_valgrind.inc source include/have_debug.inc; +# Avoid CrashReporter popup on Mac +--source include/not_crashrep.inc call mtr.add_suppression('Attempting backtrace'); call mtr.add_suppression('MSYQL_BIN_LOG::purge_logs failed to process registered files that would be purged.'); call mtr.add_suppression('MSYQL_BIN_LOG::open failed to sync the index file'); === modified file 'mysql-test/suite/innodb/t/innodb_bug53756.test' --- a/mysql-test/suite/innodb/t/innodb_bug53756.test 2010-09-30 08:28:22 +0000 +++ b/mysql-test/suite/innodb/t/innodb_bug53756.test 2011-03-15 15:06:59 +0000 @@ -17,6 +17,9 @@ # This test case needs InnoDB. --source include/have_innodb.inc +# Avoid CrashReporter popup on Mac +--source include/not_crashrep.inc + # # Precautionary clean up. # === modified file 'mysql-test/suite/innodb_plugin/t/innodb_bug53756.test' --- a/mysql-test/suite/innodb_plugin/t/innodb_bug53756.test 2010-10-03 17:39:28 +0000 +++ b/mysql-test/suite/innodb_plugin/t/innodb_bug53756.test 2011-03-15 15:06:59 +0000 @@ -17,6 +17,9 @@ # This test case needs InnoDB. -- source include/have_innodb_plugin.inc +# Avoid CrashReporter popup on Mac +--source include/not_crashrep.inc + # # Precautionary clean up. # === modified file 'mysql-test/t/crash_commit_before.test' --- a/mysql-test/t/crash_commit_before.test 2007-12-12 17:19:24 +0000 +++ b/mysql-test/t/crash_commit_before.test 2011-03-15 15:06:59 +0000 @@ -1,6 +1,8 @@ -- source include/not_embedded.inc # Don't test this under valgrind, memory leaks will occur --source include/not_valgrind.inc +# Avoid CrashReporter popup on Mac +--source include/not_crashrep.inc # Binary must be compiled with debug for crash to occur --source include/have_debug.inc === modified file 'mysql-test/t/myisam_crash_before_flush_keys.test' --- a/mysql-test/t/myisam_crash_before_flush_keys.test 2009-10-14 11:26:16 +0000 +++ b/mysql-test/t/myisam_crash_before_flush_keys.test 2011-03-15 15:06:59 +0000 @@ -8,6 +8,9 @@ --echo # Binary must be compiled with debug for crash to occur --source include/have_debug.inc +# Avoid CrashReporter popup on Mac +--source include/not_crashrep.inc + let $MYSQLD_DATADIR= `select @@datadir`; SET GLOBAL delay_key_write=ALL; CREATE TABLE t1(a INT, --===============0369751603== MIME-Version: 1.0 Content-Type: text/bzr-bundle; charset="us-ascii"; name="bzr/bjorn.munch@stripped" Content-Transfer-Encoding: 7bit Content-Disposition: inline # Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: bjorn.munch@stripped # target_branch: file:///home/bm136801/my/crashrep-51/ # testament_sha1: 665e0dbacb2d06374a86acc537131baff96c97b8 # timestamp: 2011-03-15 16:07:29 +0100 # base_revision_id: bjorn.munch@stripped\ # 00p2o4cjduuq8y42 # # Begin bundle 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 GNkyroxf4u5IpwoSEiFaE8A= --===============0369751603==--