diff options
| author | John Högberg <[email protected]> | 2019-04-05 09:34:32 +0200 |
|---|---|---|
| committer | John Högberg <[email protected]> | 2019-04-05 09:34:32 +0200 |
| commit | dacb003437e00421aca9c49348082c1ca80f89b1 (patch) | |
| tree | 4720d6f5aff05e6edb82f2f6e52c6f2f062ca9ac | |
| parent | 549e9f3cbc48fe22ff3957a495efbdec945b44ea (diff) | |
| parent | 09995dcad9b21b9514ba14979c34135442aa7586 (diff) | |
| download | otp-dacb003437e00421aca9c49348082c1ca80f89b1.tar.gz otp-dacb003437e00421aca9c49348082c1ca80f89b1.tar.bz2 otp-dacb003437e00421aca9c49348082c1ca80f89b1.zip | |
Merge branch 'john/erts/lcnt_SUITE-ignore-socket-nif-locks'
* john/erts/lcnt_SUITE-ignore-socket-nif-locks:
lcnt_SUITE: Ignore socket-NIF locks in toggle tests
| -rw-r--r-- | erts/emulator/test/lcnt_SUITE.erl | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/erts/emulator/test/lcnt_SUITE.erl b/erts/emulator/test/lcnt_SUITE.erl index 87b97037d6..2dbaec9942 100644 --- a/erts/emulator/test/lcnt_SUITE.erl +++ b/erts/emulator/test/lcnt_SUITE.erl @@ -187,5 +187,8 @@ remove_untoggleable_locks([]) -> []; remove_untoggleable_locks([{resource_monitors, _, _, _} | T]) -> remove_untoggleable_locks(T); +remove_untoggleable_locks([{'socket[gcnt]', _, _, _} | T]) -> + %% Global lock used by socket NIF + remove_untoggleable_locks(T); remove_untoggleable_locks([H | T]) -> [H | remove_untoggleable_locks(T)]. |