* 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

1 files changed, 93 insertions, 19 deletions

diff --git a/debian/patches/linked_list_mem_failure.patch b/debian/patches/linked_list_mem_failure.patch
index c3346bb..a8bbc22 100644
--- a/debian/patches/linked_list_mem_failure.patch
+++ b/debian/patches/linked_list_mem_failure.patch
@@ -1,22 +1,96 @@
 Author: Nicholas Bamber <nicholas@periapt.co.uk>
 Subject: certain tests failing
 Bug-Debian: http://bugs.debian.org/674267
-Last-Update: 2012-05-25
-Forwarded: no
---- a/mysql-test/suite/rpl/t/disabled.def
-+++ b/mysql-test/suite/rpl/t/disabled.def
-@@ -17,3 +17,6 @@
- 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
- rpl_mysql_upgrade: Fails on Debian #64773
-+rpl_heartbeat_ssl:     Debian Bug 674267 2012-05-24
-+rpl_ssl1: Debian Bug 674267 2012-05-24
-+rpl_ssl: Debian Bug 674267 2012-05-24
---- a/mysql-test/t/disabled.def
-+++ b/mysql-test/t/disabled.def
-@@ -29,3 +29,5 @@
- ssl_compress             : Bug#64773 2012-03-27 Debian local
- ssl                      : Bug#64773 2012-03-27 Debian local
- openssl_1                : Bug#64773 2012-03-27 Debian local
-+ssl_cipher               : Debian Bug 674267 2012-05-24
-+ssl_connect              : Debian Bug 674267 2012-05-24
+Last-Update: 2012-05-27
+Forwarded: not-needed
+--- /dev/null
++++ b/mysql-test/include/debian-fail-674267.inc
+@@ -0,0 +1,5 @@
++if (`select @@version_compile_machine regexp 'i[3456]86' = 1`)
++{
++  skip See Debian bug #674267;
++}
++
+--- a/mysql-test/t/ssl_connect.test
++++ b/mysql-test/t/ssl_connect.test
+@@ -1,4 +1,5 @@
+ 
++-- source include/debian-fail-674267.inc
+ -- source include/have_ssl_communication.inc
+ 
+ # Repeat connect/disconnect
+--- a/mysql-test/t/ssl_cipher.test
++++ b/mysql-test/t/ssl_cipher.test
+@@ -1,5 +1,6 @@
+ # Turn on ssl between the client and server
+ # and run a number of tests
++-- source include/debian-fail-674267.inc
+ 
+ --echo #
+ --echo # BUG#11760210 - SSL_CIPHER_LIST NOT SET OR RETURNED FOR "SHOW STATUS LIKE 'SSL_CIPHER_LIST'"
+--- a/mysql-test/suite/rpl/t/rpl_ssl.test
++++ b/mysql-test/suite/rpl/t/rpl_ssl.test
+@@ -1,3 +1,5 @@
++
++-- source include/debian-fail-674267.inc
+ source include/have_ssl_communication.inc;
+ source include/master-slave.inc;
+ 
+--- a/mysql-test/suite/rpl/t/rpl_ssl1.test
++++ b/mysql-test/suite/rpl/t/rpl_ssl1.test
+@@ -1,3 +1,5 @@
++
++-- source include/debian-fail-674267.inc
+ source include/have_ssl_communication.inc;
+ source include/master-slave.inc;
+ 
+--- a/mysql-test/suite/rpl/t/rpl_heartbeat_ssl.test
++++ b/mysql-test/suite/rpl/t/rpl_heartbeat_ssl.test
+@@ -3,6 +3,7 @@
+ # Date:   02/19/2009
+ # Purpose: Testing basic functionality of heartbeat over SSL
+ #############################################################
++-- source include/debian-fail-674267.inc
+ --source include/have_ssl_communication.inc
+ --source include/master-slave.inc
+ --echo
+--- a/mysql-test/t/openssl_1.test
++++ b/mysql-test/t/openssl_1.test
+@@ -1,6 +1,7 @@
+ # Tests for SSL connections, only run if mysqld is compiled
+ # with support for SSL.
+ 
++-- source include/debian-fail-674267.inc
+ -- source include/have_ssl_communication.inc
+ 
+ # Save the initial number of concurrent sessions
+--- a/mysql-test/t/ssl.test
++++ b/mysql-test/t/ssl.test
+@@ -1,6 +1,7 @@
+ # Turn on ssl between the client and server
+ # and run a number of tests
+ 
++-- source include/debian-fail-674267.inc
+ -- source include/have_ssl_communication.inc
+ 
+ # Save the initial number of concurrent sessions
+--- a/mysql-test/t/ssl_compress.test
++++ b/mysql-test/t/ssl_compress.test
+@@ -1,6 +1,7 @@
+ # Turn on compression between the client and server
+ # and run a number of tests
+ 
++-- source include/debian-fail-674267.inc
+ -- source include/have_ssl_communication.inc
+ -- source include/have_compress.inc
+ 
+--- a/mysql-test/t/ssl_8k_key.test
++++ b/mysql-test/t/ssl_8k_key.test
+@@ -2,6 +2,7 @@
+ #
+ # Bug#29784 YaSSL assertion failure when reading 8k key.
+ #
++-- source include/debian-fail-674267.inc
+ --exec $MYSQL --ssl --ssl-key=$MYSQL_TEST_DIR/std_data/client-key.pem --ssl-cert=$MYSQL_TEST_DIR/std_data/client-cert.pem -e "SHOW STATUS LIKE 'ssl_Cipher'" 2>&1
+ 
+ ##  This test file is for testing encrypted communication only, not other