diff options
author | Lukas Larsson <[email protected]> | 2019-01-23 10:22:17 +0100 |
---|---|---|
committer | Lukas Larsson <[email protected]> | 2019-01-23 10:22:17 +0100 |
commit | aba6a2c2b5ae9dca21c5e14f5c25b175c6b67782 (patch) | |
tree | f8d2df95eed18df1a2402488fefd8aa10df9897f /erts/emulator/test/z_SUITE.erl | |
parent | 3aba68193ab414cd807fe0757a6b6f8f20bd57ef (diff) | |
parent | a53f58ff4fc68f069c395966a0b7375523c77b65 (diff) | |
download | otp-aba6a2c2b5ae9dca21c5e14f5c25b175c6b67782.tar.gz otp-aba6a2c2b5ae9dca21c5e14f5c25b175c6b67782.tar.bz2 otp-aba6a2c2b5ae9dca21c5e14f5c25b175c6b67782.zip |
Merge branch 'lukas/erts/scheduler-pollset-fixes/OTP-15538' into maint
* lukas/erts/scheduler-pollset-fixes/OTP-15538:
erts: Fix getting of poll events on linux >= 4.15.0
erts: Use reduction based polling for starved poll-set
erts: Fix pollset test cases
Diffstat (limited to 'erts/emulator/test/z_SUITE.erl')
-rw-r--r-- | erts/emulator/test/z_SUITE.erl | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/erts/emulator/test/z_SUITE.erl b/erts/emulator/test/z_SUITE.erl index 1c52e1a934..6549108126 100644 --- a/erts/emulator/test/z_SUITE.erl +++ b/erts/emulator/test/z_SUITE.erl @@ -251,7 +251,7 @@ pollset_size(Config) when is_list(Config) -> end. check_io_debug(Config) when is_list(Config) -> - case lists:keysearch(name, 1, erlang:system_info(check_io)) of + case lists:keysearch(name, 1, hd(erlang:system_info(check_io))) of {value, {name, erts_poll}} -> check_io_debug_test(); _ -> {skipped, "Not implemented in this emulator"} end. |