List:Commits« Previous MessageNext Message »
From:Magnus Blåudd Date:March 15 2011 2:17pm
Subject:Re: bzr commit into mysql-5.1-mtr branch (bjorn.munch:2987) Bug#11762804
View as plain text  
Hi Bjorn,

looks ok.

/ Magnus

On 2011-03-15 14:55, Bjorn Munch wrote:
> #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 13:54:45 +0000
> @@ -0,0 +1,23 @@
> +# 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);
> +  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 13:54:45 +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 13:54:45 +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 13:54:45
> +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 13:54:45 +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 13:54:45 +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,
>
>
>
>
>

Thread
bzr commit into mysql-5.1-mtr branch (bjorn.munch:2987) Bug#11762804Bjorn Munch15 Mar
  • Re: bzr commit into mysql-5.1-mtr branch (bjorn.munch:2987) Bug#11762804Magnus Blåudd15 Mar