From 586deda5c617d9aa3700ec000467aa64ec57e7e3 Mon Sep 17 00:00:00 2001
From: Leif Walsh <leif@tokutek.com>
Date: Sun, 26 Aug 2012 20:08:06 +0000
Subject: [PATCH] refs #4871 don't run perf_read_write under memcheck, increase
timeout for upgrade stress tests
git-svn-id: file:///svn/toku/tokudb@47207 c7de825b-a66e-492c-adef-691d508d4ae1
---
CTestCustom.cmake | 1 +
src/tests/CMakeLists.txt | 2 +-
2 files changed, 2 insertions(+), 1 deletion(-)
diff --git a/CTestCustom.cmake b/CTestCustom.cmake
index 9faef3c691f..38cbc3b2c95 100644
--- a/CTestCustom.cmake
+++ b/CTestCustom.cmake
@@ -134,6 +134,7 @@ set(perf_tests
ydb/perf_nop.tdb
ydb/perf_ptquery.tdb
ydb/perf_ptquery2.tdb
+ ydb/perf_read_write.tdb
ydb/perf_xmalloc_free.tdb
)
diff --git a/src/tests/CMakeLists.txt b/src/tests/CMakeLists.txt
index ac4bcadfa55..a94187c2555 100644
--- a/src/tests/CMakeLists.txt
+++ b/src/tests/CMakeLists.txt
@@ -479,7 +479,7 @@ if(BUILD_TESTING)
add_test(
NAME ydb/${test}/upgrade/${oldver}/${p_or_s}/${size}
COMMAND ${CMAKE_CFG_INTDIR}/run_upgrade_stress_test.sh $<TARGET_FILE:upgrade_${oldver}_${p_or_s}_${size}_${test}> ${TOKU_SVNROOT}/tokudb.data/old-stress-test-envs/${oldver}/saved${p_or_s}-${size}-dir dir.upgrade_${oldver}_${p_or_s}_${size}_${base}.tdb ${size} 600)
- set_tests_properties(ydb/${test}/upgrade/${oldver}/${p_or_s}/${size} PROPERTIES TIMEOUT 3600)
+ set_tests_properties(ydb/${test}/upgrade/${oldver}/${p_or_s}/${size} PROPERTIES TIMEOUT 5400)
endforeach(size)
endif ()
endforeach(p_or_s)
--
2.30.9