diff options
| author | Lukas Larsson <[email protected]> | 2011-09-29 17:53:50 +0200 |
|---|---|---|
| committer | Lukas Larsson <[email protected]> | 2011-09-29 17:53:50 +0200 |
| commit | 1be1c1cb15068aed40a30210c8be34f36e38ed66 (patch) | |
| tree | 4abf3248faaa95f9c0fd6098ebab42074f196fd5 /erts/emulator/test/scheduler_SUITE.erl | |
| parent | 0911888f960502e4ee789e82141090c31a2a83a8 (diff) | |
| parent | d41617d9969253d9e66270beebac843865036baa (diff) | |
| download | otp-1be1c1cb15068aed40a30210c8be34f36e38ed66.tar.gz otp-1be1c1cb15068aed40a30210c8be34f36e38ed66.tar.bz2 otp-1be1c1cb15068aed40a30210c8be34f36e38ed66.zip | |
Merge branch 'lukas/fix_erts_testcases/OTP-9596' into dev
* lukas/fix_erts_testcases/OTP-9596:
Skip create_big_boot on platforms without crypto
Remove test_server path instead of cwd for clash test
Skip getaddr_v6 test if on the ipv4_only host
Use static port for old solaris versions
Extend time to wait for zone files to be loaded
Allow out of memory exception for max_port checks
Extend slave start timeout for windows tests
Double timeout to make sure debug builds pass
Use now instead of os:timestamp
Increase timeout in scheduler_suspend for slow platforms
Skip update_cpu_info if 'taskset' cannot be found
Diffstat (limited to 'erts/emulator/test/scheduler_SUITE.erl')
| -rw-r--r-- | erts/emulator/test/scheduler_SUITE.erl | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/erts/emulator/test/scheduler_SUITE.erl b/erts/emulator/test/scheduler_SUITE.erl index f16d0ea429..debb54579b 100644 --- a/erts/emulator/test/scheduler_SUITE.erl +++ b/erts/emulator/test/scheduler_SUITE.erl @@ -87,8 +87,17 @@ init_per_group(_GroupName, Config) -> end_per_group(_GroupName, Config) -> Config. - +init_per_testcase(update_cpu_info, Config) -> + case os:find_executable("taskset") of + false -> + {skip,"Could not find 'taskset' in path"}; + _ -> + init_per_tc(update_cpu_info, Config) + end; init_per_testcase(Case, Config) when is_list(Config) -> + init_per_tc(Case, Config). + +init_per_tc(Case, Config) -> Dog = ?t:timetrap(?DEFAULT_TIMEOUT), process_flag(priority, max), erlang:display({'------------', ?MODULE, Case, '------------'}), @@ -1030,7 +1039,7 @@ sbt_test(Config, CpuTCmd, ClBt, Bt, LP) -> ?line ok. scheduler_suspend(Config) when is_list(Config) -> - ?line Dog = ?t:timetrap(?t:minutes(2)), + ?line Dog = ?t:timetrap(?t:minutes(5)), ?line lists:foreach(fun (S) -> scheduler_suspend_test(Config, S) end, [64, 32, 16, default]), ?line ?t:timetrap_cancel(Dog), |