diff options
| author | Rickard Green <[email protected]> | 2011-12-06 14:28:13 +0100 |
|---|---|---|
| committer | Rickard Green <[email protected]> | 2011-12-06 14:28:13 +0100 |
| commit | 8d02537d8062355d8f535d79097a37c5112692a0 (patch) | |
| tree | 593014dbac8c5a641d3c4e5ea8e925c334986c57 | |
| parent | a02e9fc9be7ceea4185bd7b1b74cdd9922d4ce4e (diff) | |
| parent | ae337488eb3ad933ed5eeff5ab29130a180a3729 (diff) | |
| download | otp-8d02537d8062355d8f535d79097a37c5112692a0.tar.gz otp-8d02537d8062355d8f535d79097a37c5112692a0.tar.bz2 otp-8d02537d8062355d8f535d79097a37c5112692a0.zip | |
Merge branch 'rickard/test-fixes-r15b'
* rickard/test-fixes-r15b:
Give slow machines more time to compute result
Allow more CPU time in waiting test-cases
Skip thread_mseg_alloc_cache_clean() when no mseg_alloc
| -rw-r--r-- | erts/emulator/test/driver_SUITE.erl | 2 | ||||
| -rw-r--r-- | erts/emulator/test/mtx_SUITE.erl | 4 | ||||
| -rw-r--r-- | erts/emulator/test/scheduler_SUITE.erl | 4 |
3 files changed, 5 insertions, 5 deletions
diff --git a/erts/emulator/test/driver_SUITE.erl b/erts/emulator/test/driver_SUITE.erl index c07dbc5871..e159c37d2c 100644 --- a/erts/emulator/test/driver_SUITE.erl +++ b/erts/emulator/test/driver_SUITE.erl @@ -1796,7 +1796,7 @@ driver_select_use0(Config) -> thread_mseg_alloc_cache_clean(Config) when is_list(Config) -> case {erlang:system_info(threads), - mseg_inst_info(0), + erlang:system_info({allocator,mseg_alloc}), driver_alloc_sbct()} of {_, false, _} -> ?line {skipped, "No mseg_alloc"}; diff --git a/erts/emulator/test/mtx_SUITE.erl b/erts/emulator/test/mtx_SUITE.erl index 879d2f61dd..024c3456a8 100644 --- a/erts/emulator/test/mtx_SUITE.erl +++ b/erts/emulator/test/mtx_SUITE.erl @@ -122,7 +122,7 @@ long_rwlock(Config) when is_list(Config) -> %% A very short run time is expected, since %% threads in the test mostly wait ?t:format("RunTime=~p~n", [RunTime]), - ?line true = RunTime < 100, + ?line true = RunTime < 400, ?line RunTimeStr = "Run-time during test was "++integer_to_list(RunTime)++" ms.", case LLRes of ok -> @@ -281,7 +281,7 @@ hammer_sched_rwlock_test(FreqRead, LockCheck, Blocking, WaitLocked, WaitUnlocked _ -> {_, RunTime} = statistics(runtime), ?t:format("RunTime=~p~n", [RunTime]), - ?line true = RunTime < 500, + ?line true = RunTime < 700, {comment, "Run-time during test was " ++ integer_to_list(RunTime) diff --git a/erts/emulator/test/scheduler_SUITE.erl b/erts/emulator/test/scheduler_SUITE.erl index debb54579b..05553c2028 100644 --- a/erts/emulator/test/scheduler_SUITE.erl +++ b/erts/emulator/test/scheduler_SUITE.erl @@ -55,7 +55,7 @@ scheduler_suspend/1, reader_groups/1]). --define(DEFAULT_TIMEOUT, ?t:minutes(10)). +-define(DEFAULT_TIMEOUT, ?t:minutes(15)). -define(MIN_SCHEDULER_TEST_TIMEOUT, ?t:minutes(1)). @@ -1684,7 +1684,7 @@ do_it(Tracer, Low, Normal, High, Max, RedsPerSchedLimit) -> EndWait = now(), BalanceWait = timer:now_diff(EndWait,StartWait) div 1000, erlang:display({balance_wait, BalanceWait}), - Timeout = ?DEFAULT_TIMEOUT - ?t:seconds(10) - BalanceWait, + Timeout = ?DEFAULT_TIMEOUT - ?t:minutes(4) - BalanceWait, Res = case Timeout < ?MIN_SCHEDULER_TEST_TIMEOUT of true -> stop_work(Low, Normal, High, Max), |