summaryrefslogtreecommitdiff
path: root/debian/patches/disable_rpl_tests.patch
diff options
context:
space:
mode:
authorperiapt <periapt@bb5a2ed9-75f0-0310-a2b8-e46d7b0922c1>2012-05-30 05:38:34 +0000
committerperiapt <periapt@bb5a2ed9-75f0-0310-a2b8-e46d7b0922c1>2012-05-30 05:38:34 +0000
commit7edd79a9a40d74d4b32b988b19361b12d1d99d2e (patch)
tree1a733af59a4541576e5257a3b379c09bf474cd87 /debian/patches/disable_rpl_tests.patch
parente97e0c8e47026c6b214d8f845f9f7747d0fded50 (diff)
downloadmysql-5.5-7edd79a9a40d74d4b32b988b19361b12d1d99d2e.tar.gz
* Skipped certain SSL tests on i386 type architectures
pending investigation (cf. #674267) * Removed main_openssl_1 patch * Set SYSTEM_TYPE according to GNU Build System * In an effort to get a better handle on test coverage, made test failures on kfreebsd-i386 fatal and re-enabled full tests on hurd, skipped certain tests on kfreebsd and changed disabled tests to selectively skipped tests git-svn-id: svn://svn.debian.org/svn/pkg-mysql/mysql-5.5/branches/unstable@2127 bb5a2ed9-75f0-0310-a2b8-e46d7b0922c1
Diffstat (limited to 'debian/patches/disable_rpl_tests.patch')
-rw-r--r--debian/patches/disable_rpl_tests.patch32
1 files changed, 22 insertions, 10 deletions
diff --git a/debian/patches/disable_rpl_tests.patch b/debian/patches/disable_rpl_tests.patch
index c8fe54e..06d06a1 100644
--- a/debian/patches/disable_rpl_tests.patch
+++ b/debian/patches/disable_rpl_tests.patch
@@ -1,12 +1,24 @@
From: Clint Byrum <clint@ubuntu.com>
Bug-Ubuntu: http://pad.lv/894146
-Forwarded: no, not needed
-Description: disables test to allow build to pass while this is investigated.
-
---- a/mysql-test/suite/rpl/t/disabled.def
-+++ b/mysql-test/suite/rpl/t/disabled.def
-@@ -15,3 +15,4 @@
- rpl_get_master_version_and_clock : Bug#11766137 Jan 05 2011 joro Valgrind warnings rpl_get_master_version_and_clock
- rpl_row_until : BUG#59543 Jan 26 2011 alfranio Replication test from eits suite rpl_row_until times out
- rpl_stm_until : BUG#59543 Jan 26 2011 alfranio Replication test from eits suite rpl_row_until times out
-+rpl_heartbeat_basic : Fails intermittently on AMD64 buildds http://pad.lv/894146
+Forwarded: not needed
+Description: Skip on AMD64 builds
+Last-Update: 2012-05-29
+Reviewed-by: Nicholas Bamber <nicholas@periapt.co.uk>
+--- /dev/null
++++ b/mysql-test/include/debian-fail-lp894146.inc
+@@ -0,0 +1,5 @@
++if (`select @@version_compile_machine in ('x86_64')`)
++{
++ skip Fails intermittently on AMD64 buildds http://pad.lv/894146;
++}
++
+--- a/mysql-test/suite/rpl/t/rpl_heartbeat_basic.test
++++ b/mysql-test/suite/rpl/t/rpl_heartbeat_basic.test
+@@ -9,6 +9,7 @@
+ # * Various states of master and heartbeat
+ # * Circular replication
+ #############################################################
++--source include/debian-fail-lp894146.inc
+ --source include/master-slave.inc
+ #
+ # The test runs long and does not have any specifics to