From 52cad75df03851a24bb6483b8c64239216592f01 Mon Sep 17 00:00:00 2001
From: Leif Walsh <leif@tokutek.com>
Date: Wed, 17 Apr 2013 00:00:27 -0400
Subject: [PATCH] [t:4814] make more tests' timeouts longer

git-svn-id: file:///svn/toku/tokudb@43341 c7de825b-a66e-492c-adef-691d508d4ae1
---
 newbrt/tests/CMakeLists.txt | 11 ++++++++---
 src/tests/CMakeLists.txt    | 10 ++++++++--
 2 files changed, 16 insertions(+), 5 deletions(-)

diff --git a/newbrt/tests/CMakeLists.txt b/newbrt/tests/CMakeLists.txt
index 0c3f7d39187..b37ede5c2fd 100644
--- a/newbrt/tests/CMakeLists.txt
+++ b/newbrt/tests/CMakeLists.txt
@@ -98,13 +98,18 @@ if(BUILD_TESTING)
     endif()
   endforeach(src)
 
-  ## give some tests, that time out when run with valgrind, 1 hour to complete
+  ## give some tests, that time out normally, 1 hour to complete
   set(long_tests
-    subblock-test-checksum
     subblock-test-compression
-    benchmark-test
     benchmark-test_256
     is_empty
     )
   set_tests_properties(${long_tests} PROPERTIES TIMEOUT 3600)
+  ## some take even longer, with valgrind
+  set(extra_long_tests
+    subblock-test-checksum
+    orthopush-flush
+    benchmark-test
+    )
+  set_tests_properties(${extra_long_tests} PROPERTIES TIMEOUT 5400)
 endif(BUILD_TESTING)
diff --git a/src/tests/CMakeLists.txt b/src/tests/CMakeLists.txt
index 9478f10c3b0..fd095655094 100644
--- a/src/tests/CMakeLists.txt
+++ b/src/tests/CMakeLists.txt
@@ -587,11 +587,10 @@ if(BUILD_TESTING)
 
   set_tests_properties(${tdb_tests_that_should_fail} PROPERTIES WILL_FAIL TRUE)
 
-  ## give some tests, that time out when run with valgrind, 1 hour to complete
+  ## give some tests, that time out normally, 1 hour to complete
   set(long_tests
     drd_test_4015.tdb
     test_query.tdb
-    loader-stress-del.p.loader
     loader-stress-del.nop.loader
     test1572.tdb
     checkpoint_1.tdb
@@ -623,4 +622,11 @@ if(BUILD_TESTING)
       )
   endif (BDB_FOUND)
   set_tests_properties(${long_tests} PROPERTIES TIMEOUT 3600)
+  ## some take even longer, with valgrind
+  set(extra_long_tests
+    test3039.tdb
+    loader-dup-test0.tdb
+    loader-stress-del.p.loader
+    )
+  set_tests_properties(${extra_long_tests} PROPERTIES TIMEOUT 5400)
 endif(BUILD_TESTING)