aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRickard Green <[email protected]>2018-04-25 16:05:03 +0200
committerRickard Green <[email protected]>2018-04-25 16:05:03 +0200
commite08d90c51ad47b64f05bb1d51d9595b642637b9f (patch)
tree0dfae00435a9d238a8887cad9c3a3cbc73789b30
parent960467ead200635cb935dfd3aa5a5abe38299ca6 (diff)
downloadotp-e08d90c51ad47b64f05bb1d51d9595b642637b9f.tar.gz
otp-e08d90c51ad47b64f05bb1d51d9595b642637b9f.tar.bz2
otp-e08d90c51ad47b64f05bb1d51d9595b642637b9f.zip
Do not run tests that conflicts with dirty schedulers test
-rw-r--r--erts/emulator/test/statistics_SUITE.erl7
1 files changed, 7 insertions, 0 deletions
diff --git a/erts/emulator/test/statistics_SUITE.erl b/erts/emulator/test/statistics_SUITE.erl
index 029a6de897..3f2897242e 100644
--- a/erts/emulator/test/statistics_SUITE.erl
+++ b/erts/emulator/test/statistics_SUITE.erl
@@ -310,6 +310,13 @@ scheduler_wall_time_all(Config) when is_list(Config) ->
scheduler_wall_time_test(scheduler_wall_time_all).
scheduler_wall_time_test(Type) ->
+ case string:find(erlang:system_info(system_version),
+ "dirty-schedulers-TEST") == nomatch of
+ true -> run_scheduler_wall_time_test(Type);
+ false -> {skip, "Cannot be run with dirty-schedulers-TEST build"}
+ end.
+
+run_scheduler_wall_time_test(Type) ->
%% Should return undefined if system_flag is not turned on yet
undefined = statistics(Type),
%% Turn on statistics