From 9fcc34b4ae1bdcf8aeb4dad0295b7d3534491a17 Mon Sep 17 00:00:00 2001 From: unknown Date: Thu, 30 Nov 2006 15:12:28 +0100 Subject: [PATCH] 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. --- storage/maria/unittest/Makefile.am | 4 +- unittest/mysys/Makefile.am | 60 ++++++++++++++++-------------- 2 files changed, 35 insertions(+), 29 deletions(-) diff --git a/storage/maria/unittest/Makefile.am b/storage/maria/unittest/Makefile.am index d0b247d65e1..969529db9c9 100644 --- a/storage/maria/unittest/Makefile.am +++ b/storage/maria/unittest/Makefile.am @@ -25,5 +25,7 @@ LDADD= $(top_builddir)/unittest/mytap/libmytap.a \ $(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 lockman-t lockman1-t lockman2-t +noinst_PROGRAMS = ma_control_file-t trnman-t lockman2-t +# 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 CLEANFILES = maria_control 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_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_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_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_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_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_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_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_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_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