aboutsummaryrefslogtreecommitdiffstats
path: root/erts/emulator
diff options
context:
space:
mode:
authorLukas Larsson <[email protected]>2011-09-21 09:49:34 +0200
committerLukas Larsson <[email protected]>2011-09-21 09:49:34 +0200
commit1856a071183a3d0c546b2736dbec603f504298b2 (patch)
treeb64ebfc6f4e9331d5fd5526524bca08ba1cde16c /erts/emulator
parent53cf0b70c705e0bf6c09f83f2ce2709d79593ce6 (diff)
downloadotp-1856a071183a3d0c546b2736dbec603f504298b2.tar.gz
otp-1856a071183a3d0c546b2736dbec603f504298b2.tar.bz2
otp-1856a071183a3d0c546b2736dbec603f504298b2.zip
Skip update_cpu_info if 'taskset' cannot be found
Diffstat (limited to 'erts/emulator')
-rw-r--r--erts/emulator/test/scheduler_SUITE.erl11
1 files changed, 10 insertions, 1 deletions
diff --git a/erts/emulator/test/scheduler_SUITE.erl b/erts/emulator/test/scheduler_SUITE.erl
index f16d0ea429..3606b8a730 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, '------------'}),