Commit f8d36040 authored by unknown's avatar unknown

Fixed tests consumed big amount of disk space to be "BIG".

parent a445a3f3
...@@ -76,12 +76,12 @@ MY_ADD_TEST(ma_pagecache_single_1k) ...@@ -76,12 +76,12 @@ MY_ADD_TEST(ma_pagecache_single_1k)
ADD_EXECUTABLE(ma_pagecache_single_8k-t ${ma_pagecache_single_src}) ADD_EXECUTABLE(ma_pagecache_single_8k-t ${ma_pagecache_single_src})
SET_TARGET_PROPERTIES(ma_pagecache_single_8k-t SET_TARGET_PROPERTIES(ma_pagecache_single_8k-t
PROPERTIES COMPILE_FLAGS "${ma_pagecache_common_cppflags} -DTEST_PAGE_SIZE=8192") PROPERTIES COMPILE_FLAGS "${ma_pagecache_common_cppflags} -DTEST_PAGE_SIZE=8192 -DBIG")
MY_ADD_TEST(ma_pagecache_single_8k) MY_ADD_TEST(ma_pagecache_single_8k)
ADD_EXECUTABLE(ma_pagecache_single_64k-t ${ma_pagecache_single_src}) ADD_EXECUTABLE(ma_pagecache_single_64k-t ${ma_pagecache_single_src})
SET_TARGET_PROPERTIES(ma_pagecache_single_64k-t SET_TARGET_PROPERTIES(ma_pagecache_single_64k-t
PROPERTIES COMPILE_FLAGS "${ma_pagecache_common_cppflags} -DTEST_PAGE_SIZE=65536") PROPERTIES COMPILE_FLAGS "${ma_pagecache_common_cppflags} -DTEST_PAGE_SIZE=65536 -DBIG")
MY_ADD_TEST(ma_pagecache_single_64k) MY_ADD_TEST(ma_pagecache_single_64k)
ADD_EXECUTABLE(ma_pagecache_consist_1k-t ${ma_pagecache_consist_src}) ADD_EXECUTABLE(ma_pagecache_consist_1k-t ${ma_pagecache_consist_src})
......
...@@ -39,6 +39,7 @@ static TRN *trn= &dummy_transaction_object; ...@@ -39,6 +39,7 @@ static TRN *trn= &dummy_transaction_object;
#define LOG_FILE_SIZE (1024L*1024L*1024L + 1024L*1024L*512) #define LOG_FILE_SIZE (1024L*1024L*1024L + 1024L*1024L*512)
#define ITERATIONS 2 #define ITERATIONS 2
#define READONLY 0 #define READONLY 0
#define BIG 1
#else #else
...@@ -48,6 +49,7 @@ static TRN *trn= &dummy_transaction_object; ...@@ -48,6 +49,7 @@ static TRN *trn= &dummy_transaction_object;
#define LOG_FILE_SIZE (1024L*1024L*1024L + 1024L*1024L*512) #define LOG_FILE_SIZE (1024L*1024L*1024L + 1024L*1024L*512)
#define ITERATIONS 2 #define ITERATIONS 2
#define READONLY 1 #define READONLY 1
#undef BIG
#endif /*READONLY_TEST*/ #endif /*READONLY_TEST*/
...@@ -243,6 +245,15 @@ int main(int argc __attribute__((unused)), char *argv[]) ...@@ -243,6 +245,15 @@ int main(int argc __attribute__((unused)), char *argv[])
int rc; int rc;
MY_INIT(argv[0]); MY_INIT(argv[0]);
plan(0); // read configuration (MYTAP_CONFIG)
#ifdef BIG
if (skip_big_tests)
{
plan(1);
ok(1, "skipped as big test");
return 0;
}
#endif
load_defaults("my", load_default_groups, &argc, &argv); load_defaults("my", load_default_groups, &argc, &argv);
get_options(&argc, &argv); get_options(&argc, &argv);
......
...@@ -35,7 +35,7 @@ static const char *default_dbug_option; ...@@ -35,7 +35,7 @@ static const char *default_dbug_option;
#ifdef MULTIFLUSH_TEST #ifdef MULTIFLUSH_TEST
#define LONG_BUFFER_SIZE (16384L) #define LONG_BUFFER_SZ (16384L)
#define MIN_REC_LENGTH 10 #define MIN_REC_LENGTH 10
#define SHOW_DIVIDER 20 #define SHOW_DIVIDER 20
#define ITERATIONS 10000 #define ITERATIONS 10000
...@@ -45,7 +45,7 @@ static const char *default_dbug_option; ...@@ -45,7 +45,7 @@ static const char *default_dbug_option;
#else #else
#define LONG_BUFFER_SIZE (512L*1024L*1024L) #define LONG_BUFFER_SZ (512L*1024L*1024L)
#define MIN_REC_LENGTH 30 #define MIN_REC_LENGTH 30
#define SHOW_DIVIDER 10 #define SHOW_DIVIDER 10
#define ITERATIONS 3 #define ITERATIONS 3
...@@ -55,6 +55,8 @@ static const char *default_dbug_option; ...@@ -55,6 +55,8 @@ static const char *default_dbug_option;
#endif #endif
#define LONG_BUFFER_SIZE (LONG_BUFFER_SZ >> (skip_big_tests ? 4 : 0))
static uint number_of_writers= WRITERS; static uint number_of_writers= WRITERS;
static uint number_of_flushers= FLUSHERS; static uint number_of_flushers= FLUSHERS;
...@@ -270,6 +272,7 @@ int main(int argc __attribute__((unused)), ...@@ -270,6 +272,7 @@ int main(int argc __attribute__((unused)),
int rc; int rc;
MY_INIT(argv[0]); MY_INIT(argv[0]);
// plan read MYTAP_CONFIG so skip_big_tests will be set before using
plan(WRITERS + FLUSHERS + plan(WRITERS + FLUSHERS +
ITERATIONS * WRITERS * 3 + FLUSH_ITERATIONS * FLUSHERS ); ITERATIONS * WRITERS * 3 + FLUSH_ITERATIONS * FLUSHERS );
/* We don't need to do physical syncs in this test */ /* We don't need to do physical syncs in this test */
......
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