aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRickard Green <[email protected]>2016-06-22 16:53:13 +0200
committerRickard Green <[email protected]>2016-06-22 17:04:37 +0200
commit377b2cd04ec0cc8793b516f930fe19be98e21a3d (patch)
tree6ab01d86e34600f893ca5525de52701a9d618d3d
parent9e48c3bd4417b33b907c2479bc4a1e8cd79a34b3 (diff)
downloadotp-377b2cd04ec0cc8793b516f930fe19be98e21a3d.tar.gz
otp-377b2cd04ec0cc8793b516f930fe19be98e21a3d.tar.bz2
otp-377b2cd04ec0cc8793b516f930fe19be98e21a3d.zip
Fix scheduler_SUITE:update_cpu_info test
-rw-r--r--erts/emulator/test/scheduler_SUITE.erl6
1 files changed, 3 insertions, 3 deletions
diff --git a/erts/emulator/test/scheduler_SUITE.erl b/erts/emulator/test/scheduler_SUITE.erl
index f18d79d770..936c171214 100644
--- a/erts/emulator/test/scheduler_SUITE.erl
+++ b/erts/emulator/test/scheduler_SUITE.erl
@@ -793,13 +793,13 @@ update_cpu_info(Config) when is_list(Config) ->
io:format("START - Affinity mask: ~p - Schedulers online: ~p - Scheduler bindings: ~p~n",
[OldAff, OldOnline, erlang:system_info(scheduler_bindings)]),
case {erlang:system_info(logical_processors_available), OldAff} of
- {Avail, _} when Avail == unknown; OldAff == unknown ->
+ {Avail, _} when Avail == unknown; OldAff == unknown; OldAff == 1 ->
%% Nothing much to test; just a smoke test
case erlang:system_info(update_cpu_info) of
unchanged -> ok;
changed -> ok
end;
- _ ->
+ {Avail, _} ->
try
adjust_schedulers_online(),
case erlang:system_info(schedulers_online) of
@@ -810,7 +810,7 @@ update_cpu_info(Config) when is_list(Config) ->
%% unset least significant bit
Aff = (OldAff band (OldAff - 1)),
set_affinity_mask(Aff),
- Onln1 = Onln0 - 1,
+ Onln1 = Avail - 1,
case adjust_schedulers_online() of
{Onln0, Onln1} ->
Onln1 = erlang:system_info(schedulers_online),