Commit 26f685e7 authored by Guilhem Bichot's avatar Guilhem Bichot

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"

storage/maria/unittest/CMakeLists.txt:
  disabling lockman2-t
storage/maria/unittest/Makefile.am:
  disabling lockman2-t
parent abdda9e2
...@@ -22,7 +22,6 @@ LINK_LIBRARIES(maria myisam mytap mysys dbug strings wsock32 zlib) ...@@ -22,7 +22,6 @@ LINK_LIBRARIES(maria myisam mytap mysys dbug strings wsock32 zlib)
ADD_EXECUTABLE(ma_control_file-t ma_control_file-t.c) ADD_EXECUTABLE(ma_control_file-t ma_control_file-t.c)
ADD_EXECUTABLE(trnman-t trnman-t.c) ADD_EXECUTABLE(trnman-t trnman-t.c)
ADD_EXECUTABLE(lockman2-t lockman2-t.c)
ADD_EXECUTABLE(ma_test_loghandler-t ADD_EXECUTABLE(ma_test_loghandler-t
ma_test_loghandler-t.c ma_maria_log_cleanup.c ma_loghandler_examples.c) ma_test_loghandler-t.c ma_maria_log_cleanup.c ma_loghandler_examples.c)
ADD_EXECUTABLE(ma_test_loghandler_multigroup-t ADD_EXECUTABLE(ma_test_loghandler_multigroup-t
......
...@@ -27,7 +27,7 @@ LDADD= $(top_builddir)/unittest/mytap/libmytap.a \ ...@@ -27,7 +27,7 @@ LDADD= $(top_builddir)/unittest/mytap/libmytap.a \
$(top_builddir)/mysys/libmysys.a \ $(top_builddir)/mysys/libmysys.a \
$(top_builddir)/dbug/libdbug.a \ $(top_builddir)/dbug/libdbug.a \
$(top_builddir)/strings/libmystrings.a @ZLIB_LIBS@ $(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_1k-t ma_pagecache_single_8k-t \
ma_pagecache_single_64k-t \ ma_pagecache_single_64k-t \
ma_pagecache_consist_1k-t \ ma_pagecache_consist_1k-t \
...@@ -103,7 +103,8 @@ ma_pagecache_rwconsist_1k_t_SOURCES = ma_pagecache_rwconsist.c ...@@ -103,7 +103,8 @@ ma_pagecache_rwconsist_1k_t_SOURCES = ma_pagecache_rwconsist.c
ma_pagecache_rwconsist_1k_t_CPPFLAGS = -DTEST_PAGE_SIZE=1024 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, # 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 \ CLEANFILES = maria_log_control page_cache_test_file_1 \
maria_log.???????? maria_log.????????
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment