diff options
| author | Rickard Green <[email protected]> | 2018-04-26 16:11:17 +0200 |
|---|---|---|
| committer | Rickard Green <[email protected]> | 2018-04-26 16:11:17 +0200 |
| commit | 8313eae72dd170d2f4502d225b74dbf543198313 (patch) | |
| tree | 8f52de3621eae60662f3ee5e740f2a2767327611 | |
| parent | 51a4e9b84afe5f6deccb234253281cedc9d1fcfd (diff) | |
| parent | e08d90c51ad47b64f05bb1d51d9595b642637b9f (diff) | |
| download | otp-8313eae72dd170d2f4502d225b74dbf543198313.tar.gz otp-8313eae72dd170d2f4502d225b74dbf543198313.tar.bz2 otp-8313eae72dd170d2f4502d225b74dbf543198313.zip | |
Merge branch 'rickard/dirty-schedulers-test-fix/OTP-15046'
* rickard/dirty-schedulers-test-fix/OTP-15046:
Do not run tests that conflicts with dirty schedulers test
| -rw-r--r-- | erts/emulator/test/statistics_SUITE.erl | 7 |
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 |