From 843d75ac2ab5c9e18ca09d2729a24f1781f6610a Mon Sep 17 00:00:00 2001 From: Ichthyostega Date: Sun, 13 Oct 2013 02:50:04 +0200 Subject: [PATCH] test.sh: double VSize limits to prevent frequent test suite failure especially the DiagnosticContext_test seemst to hit the previously set limits regularily, which is somewhat strange --- tests/library/diagnostic-context-test.cpp | 11 +++++++---- tests/test.sh | 4 ++-- 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/tests/library/diagnostic-context-test.cpp b/tests/library/diagnostic-context-test.cpp index ba1183510..2e4edfd11 100644 --- a/tests/library/diagnostic-context-test.cpp +++ b/tests/library/diagnostic-context-test.cpp @@ -40,7 +40,7 @@ namespace test{ namespace { // private test setup... /* WARNING: memory hungry */ - const uint NUM_THREADS = 40; + const uint NUM_THREADS = 100; const uint MAX_RAND = 100*1000; inline bool @@ -148,9 +148,12 @@ namespace test{ * take a snapshot of the full ContextStack and then unwind. * Thus the captured numbers must from a decreasing sequence * of odd values. - * @warning this test case causes memory pressure. - * The reason seems to be the frequent re-allocations - * of the vector used to take the snapshots + * @warning this test case seems to cause memory pressure. + * When running the test suite with VSize limit 500MB, + * we frequently got aborts even with 40 threads. + * This is surprising, since all of the lists + * generated in the individual threads are + * of size below 20 elements. */ void verify_heavilyParallelUsage() diff --git a/tests/test.sh b/tests/test.sh index 214b7641c..7b728dcf3 100755 --- a/tests/test.sh +++ b/tests/test.sh @@ -83,10 +83,10 @@ LOGSUPPRESS='^\(\*\*[0-9]*\*\* \)\?[0-9]\{10,\}[:!] \(TRACE\|INFO\|NOTICE\|WARNI #config LIMIT_CPU=5 LIMIT_TIME=10 -LIMIT_VSZ=524288 +LIMIT_VSZ=1048576 LIMIT_VG_CPU=20 LIMIT_VG_TIME=30 -LIMIT_VG_VSZ=524288 +LIMIT_VG_VSZ=1048576 #configf HEAD~ Configuration Files; configuration files; define variables to configure the test