commit into MySQL/Maria:mysql-maria branch (guilhem:2653) Bug#34744

[Guilhem Bichot]

#At bzr+ssh://bk-internal.mysql.com/bzrroot/server/mysql-maria/

 2653 Guilhem Bichot	2008-06-13
      disabling lockman2-t: takes too much time for a unit test (>=15 min), and what it
      tests is not used in Maria, this fixes BUG#34744 "Maria Unit test "lockman2" fails
      on Mac OS X 10.4 PowerPC 64-bit"
modified:
  storage/maria/unittest/CMakeLists.txt
  storage/maria/unittest/Makefile.am

per-file comments:
  storage/maria/unittest/CMakeLists.txt
    disabling lockman2-t
  storage/maria/unittest/Makefile.am
    disabling lockman2-t
=== modified file 'storage/maria/unittest/CMakeLists.txt'
--- a/storage/maria/unittest/CMakeLists.txt	2008-04-02 15:08:30 +0000
+++ b/storage/maria/unittest/CMakeLists.txt	2008-06-13 09:47:17 +0000
@@ -22,7 +22,6 @@ LINK_LIBRARIES(maria myisam mytap mysys 
 
 ADD_EXECUTABLE(ma_control_file-t ma_control_file-t.c)
 ADD_EXECUTABLE(trnman-t trnman-t.c)
-ADD_EXECUTABLE(lockman2-t lockman2-t.c)
 ADD_EXECUTABLE(ma_test_loghandler-t  
 	ma_test_loghandler-t.c ma_maria_log_cleanup.c ma_loghandler_examples.c)
 ADD_EXECUTABLE(ma_test_loghandler_multigroup-t  

=== modified file 'storage/maria/unittest/Makefile.am'
--- a/storage/maria/unittest/Makefile.am	2008-06-09 21:54:30 +0000
+++ b/storage/maria/unittest/Makefile.am	2008-06-13 09:47:17 +0000
@@ -27,7 +27,7 @@ LDADD=			$(top_builddir)/unittest/mytap/
 			$(top_builddir)/mysys/libmysys.a \
 			$(top_builddir)/dbug/libdbug.a \
 			$(top_builddir)/strings/libmystrings.a @ZLIB_LIBS@
-noinst_PROGRAMS =	ma_control_file-t trnman-t lockman2-t \
+noinst_PROGRAMS =	ma_control_file-t trnman-t \
 			ma_pagecache_single_1k-t ma_pagecache_single_8k-t \
 			ma_pagecache_single_64k-t \
 			ma_pagecache_consist_1k-t \
@@ -103,7 +103,8 @@ ma_pagecache_rwconsist_1k_t_SOURCES =	ma
 ma_pagecache_rwconsist_1k_t_CPPFLAGS = -DTEST_PAGE_SIZE=1024
 
 # the generic lock manager may not be used in the end and lockman1-t crashes,
-# so we don't build lockman-t and lockman1-t 
+# and lockman2-t takes at least quarter an hour,
+# so we don't build lockman-t and lockman1-t and lockman2-t 
 CLEANFILES =		maria_log_control page_cache_test_file_1 \
 			maria_log.????????