Add a global suppression for O_DIRECT failures

Fixes up commit b8ad6fb
MariaDB · Nov 29, 2022 · 499ef7b · 499ef7b
1 parent b8ad6fb
commit 499ef7b
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 6 deletions.
diff --git a/mysql-test/mysql-test-run.pl b/mysql-test/mysql-test-run.pl
@@ -4521,6 +4521,7 @@ ($$)
      qr|Linux Native AIO|, # warning that aio does not work on /dev/shm
      qr|InnoDB: io_setup\(\) attempt|,
      qr|InnoDB: io_setup\(\) failed with EAGAIN|,
+     qr/InnoDB: Failed to set (O_DIRECT|DIRECTIO_ON) on file/,
      qr|setrlimit could not change the size of core files to 'infinity';|,
      qr|feedback plugin: failed to retrieve the MAC address|,
      qr|Plugin 'FEEDBACK' init function returned error|,

diff --git a/mysql-test/suite/innodb/t/create_isl_with_direct.test b/mysql-test/suite/innodb/t/create_isl_with_direct.test
@@ -1,9 +1,3 @@
---disable_query_log
-call mtr.add_suppression("InnoDB: Failed to set .*DIRECT");
-# The below mtr suppression to avoid failure in solaris platform.
-CALL mtr.add_suppression("\\[ERROR\\] InnoDB: Failed to set DIRECTIO_ON on file.*");
---enable_query_log
-
 --source include/not_embedded.inc
 --source include/have_innodb.inc
 --source include/have_symlink.inc