Maria - misc fixes:

don't run tests depending on the generic lock manager which will be
removed; don't run page cache unit tests by default (too intensive).


storage/maria/unittest/Makefile.am:
  don't run tests depending on the generic lock manager (it will 
  be removed in the end), one of them crashes.
unittest/mysys/Makefile.am:
  page cache tests put a too high load, causes problems on shared machines;
  so we still build them but give them a suffix so that they are
  not run by the default "test-unit" Makefile target.

1 files changed, 36 insertions, 32 deletions

diff --git a/unittest/mysys/Makefile.am b/unittest/mysys/Makefile.am
index 3ef1c3af587..8dd0416dbac 100644
--- a/unittest/mysys/Makefile.am
+++ b/unittest/mysys/Makefile.am
@@ -7,13 +7,17 @@ LDADD 		= $(top_builddir)/unittest/mytap/libmytap.a \
 		  $(top_builddir)/dbug/libdbug.a \
 		  $(top_builddir)/strings/libmystrings.a
 
+# tests with the "big" suffix are too big to run for every push,
+# cause load problems on shared machines. So we build them,
+# but don't run them by default (for this, a non "-t" suffix is used).
+# You can run them by hand (how: see "test" target in upper dir).
 noinst_PROGRAMS  =	bitmap-t base64-t my_atomic-t \
-			mf_pagecache_single_1k-t mf_pagecache_single_8k-t \
-			mf_pagecache_single_64k-t \
-			mf_pagecache_consist_1k-t mf_pagecache_consist_64k-t \
-			mf_pagecache_consist_1kHC-t mf_pagecache_consist_64kHC-t \
-			mf_pagecache_consist_1kRD-t mf_pagecache_consist_64kRD-t \
-			mf_pagecache_consist_1kWR-t mf_pagecache_consist_64kWR-t
+			mf_pagecache_single_1k-t-big mf_pagecache_single_8k-t-big \
+			mf_pagecache_single_64k-t-big \
+			mf_pagecache_consist_1k-t-big mf_pagecache_consist_64k-t-big \
+			mf_pagecache_consist_1kHC-t-big mf_pagecache_consist_64kHC-t-big \
+			mf_pagecache_consist_1kRD-t-big mf_pagecache_consist_64kRD-t-big \
+			mf_pagecache_consist_1kWR-t-big mf_pagecache_consist_64kWR-t-big
 
 # tests for mysys/mf_pagecache.c
 
@@ -21,31 +25,31 @@ mf_pagecache_single_src =	mf_pagecache_single.c $(top_srcdir)/mysys/mf_pagecache
 mf_pagecache_consist_src =	mf_pagecache_consist.c $(top_srcdir)/mysys/mf_pagecache.c test_file.c test_file.h
 mf_pagecache_common_cppflags =	-DEXTRA_DEBUG -DPAGECACHE_DEBUG -DMAIN
 
-mf_pagecache_single_1k_t_SOURCES =	$(mf_pagecache_single_src)
-mf_pagecache_single_8k_t_SOURCES =	$(mf_pagecache_single_src)
-mf_pagecache_single_64k_t_SOURCES =	$(mf_pagecache_single_src)
-mf_pagecache_single_1k_t_CPPFLAGS = 	$(mf_pagecache_common_cppflags) -DPAGE_SIZE=1024
-mf_pagecache_single_8k_t_CPPFLAGS = 	$(mf_pagecache_common_cppflags) -DPAGE_SIZE=8192
-mf_pagecache_single_64k_t_CPPFLAGS = 	$(mf_pagecache_common_cppflags) -DPAGE_SIZE=65536
-
-mf_pagecache_consist_1k_t_SOURCES =	$(mf_pagecache_consist_src)
-mf_pagecache_consist_1k_t_CPPFLAGS = 	$(mf_pagecache_common_cppflags) -DPAGE_SIZE=1024
-mf_pagecache_consist_64k_t_SOURCES =	$(mf_pagecache_consist_src)
-mf_pagecache_consist_64k_t_CPPFLAGS = 	$(mf_pagecache_common_cppflags) -DPAGE_SIZE=65536
-
-mf_pagecache_consist_1kHC_t_SOURCES =	$(mf_pagecache_consist_src)
-mf_pagecache_consist_1kHC_t_CPPFLAGS = 	$(mf_pagecache_common_cppflags) -DPAGE_SIZE=1024 -DTEST_HIGH_CONCURENCY
-mf_pagecache_consist_64kHC_t_SOURCES =	$(mf_pagecache_consist_src)
-mf_pagecache_consist_64kHC_t_CPPFLAGS = 	$(mf_pagecache_common_cppflags) -DPAGE_SIZE=65536 -DTEST_HIGH_CONCURENCY
-
-mf_pagecache_consist_1kRD_t_SOURCES =	$(mf_pagecache_consist_src)
-mf_pagecache_consist_1kRD_t_CPPFLAGS = 	$(mf_pagecache_common_cppflags) -DPAGE_SIZE=1024 -DTEST_READERS
-mf_pagecache_consist_64kRD_t_SOURCES =	$(mf_pagecache_consist_src)
-mf_pagecache_consist_64kRD_t_CPPFLAGS = 	$(mf_pagecache_common_cppflags) -DPAGE_SIZE=65536 -DTEST_READERS
-
-mf_pagecache_consist_1kWR_t_SOURCES =	$(mf_pagecache_consist_src)
-mf_pagecache_consist_1kWR_t_CPPFLAGS = 	$(mf_pagecache_common_cppflags) -DPAGE_SIZE=1024 -DTEST_WRITERS
-mf_pagecache_consist_64kWR_t_SOURCES =	$(mf_pagecache_consist_src)
-mf_pagecache_consist_64kWR_t_CPPFLAGS = 	$(mf_pagecache_common_cppflags) -DPAGE_SIZE=65536 -DTEST_WRITERS
+mf_pagecache_single_1k_t_big_SOURCES =	$(mf_pagecache_single_src)
+mf_pagecache_single_8k_t_big_SOURCES =	$(mf_pagecache_single_src)
+mf_pagecache_single_64k_t_big_SOURCES =	$(mf_pagecache_single_src)
+mf_pagecache_single_1k_t_big_CPPFLAGS = 	$(mf_pagecache_common_cppflags) -DPAGE_SIZE=1024
+mf_pagecache_single_8k_t_big_CPPFLAGS = 	$(mf_pagecache_common_cppflags) -DPAGE_SIZE=8192
+mf_pagecache_single_64k_t_big_CPPFLAGS = 	$(mf_pagecache_common_cppflags) -DPAGE_SIZE=65536
+
+mf_pagecache_consist_1k_t_big_SOURCES =	$(mf_pagecache_consist_src)
+mf_pagecache_consist_1k_t_big_CPPFLAGS = 	$(mf_pagecache_common_cppflags) -DPAGE_SIZE=1024
+mf_pagecache_consist_64k_t_big_SOURCES =	$(mf_pagecache_consist_src)
+mf_pagecache_consist_64k_t_big_CPPFLAGS = 	$(mf_pagecache_common_cppflags) -DPAGE_SIZE=65536
+
+mf_pagecache_consist_1kHC_t_big_SOURCES =	$(mf_pagecache_consist_src)
+mf_pagecache_consist_1kHC_t_big_CPPFLAGS = 	$(mf_pagecache_common_cppflags) -DPAGE_SIZE=1024 -DTEST_HIGH_CONCURENCY
+mf_pagecache_consist_64kHC_t_big_SOURCES =	$(mf_pagecache_consist_src)
+mf_pagecache_consist_64kHC_t_big_CPPFLAGS = 	$(mf_pagecache_common_cppflags) -DPAGE_SIZE=65536 -DTEST_HIGH_CONCURENCY
+
+mf_pagecache_consist_1kRD_t_big_SOURCES =	$(mf_pagecache_consist_src)
+mf_pagecache_consist_1kRD_t_big_CPPFLAGS = 	$(mf_pagecache_common_cppflags) -DPAGE_SIZE=1024 -DTEST_READERS
+mf_pagecache_consist_64kRD_t_big_SOURCES =	$(mf_pagecache_consist_src)
+mf_pagecache_consist_64kRD_t_big_CPPFLAGS = 	$(mf_pagecache_common_cppflags) -DPAGE_SIZE=65536 -DTEST_READERS
+
+mf_pagecache_consist_1kWR_t_big_SOURCES =	$(mf_pagecache_consist_src)
+mf_pagecache_consist_1kWR_t_big_CPPFLAGS = 	$(mf_pagecache_common_cppflags) -DPAGE_SIZE=1024 -DTEST_WRITERS
+mf_pagecache_consist_64kWR_t_big_SOURCES =	$(mf_pagecache_consist_src)
+mf_pagecache_consist_64kWR_t_big_CPPFLAGS = 	$(mf_pagecache_common_cppflags) -DPAGE_SIZE=65536 -DTEST_WRITERS
 
 CLEANFILES = 	my_pagecache_debug.log page_cache_test_file_1