increase join_timeout for upgrade stress tests

git-svn-id: file:///svn/toku/tokudb@50632 c7de825b-a66e-492c-adef-691d508d4ae1
This commit is contained in:
Leif Walsh 2013-04-17 00:01:20 -04:00 committed by Yoni Fogel
parent e485a1218e
commit dd252ad3f5
2 changed files with 4 additions and 3 deletions

View file

@ -496,7 +496,7 @@ if(BUILD_TESTING OR BUILD_SRC_TESTS)
add_custom_executable(upgrade_${oldver}_${p_or_s}_${size} ${test} ${base}) add_custom_executable(upgrade_${oldver}_${p_or_s}_${size} ${test} ${base})
add_test( add_test(
NAME ydb/${test}/upgrade/${oldver}/${p_or_s}/${size} 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) 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 7200)
set_tests_properties(ydb/${test}/upgrade/${oldver}/${p_or_s}/${size} PROPERTIES TIMEOUT 10800) set_tests_properties(ydb/${test}/upgrade/${oldver}/${p_or_s}/${size} PROPERTIES TIMEOUT 10800)
endforeach(size) endforeach(size)
endif () endif ()

View file

@ -1,13 +1,14 @@
#!/usr/bin/env bash #!/usr/bin/env bash
if [[ $# -lt 5 ]]; then exit 1; fi if [[ $# -lt 6 ]]; then exit 1; fi
bin=$1; shift bin=$1; shift
saveddir=$1; shift saveddir=$1; shift
envdir=$1; shift envdir=$1; shift
size=$1; shift size=$1; shift
time=$1; shift time=$1; shift
jointime=$1; shift
rm -rf $envdir rm -rf $envdir
cp -r $saveddir $envdir cp -r $saveddir $envdir
$bin --only_stress --num_elements $size --num_seconds $time $bin --only_stress --num_elements $size --num_seconds $time --join_timeout $jointime