aboutsummaryrefslogtreecommitdiffstats
path: root/lib/tools/test
diff options
context:
space:
mode:
authorJohn Högberg <[email protected]>2018-02-13 09:55:47 +0100
committerJohn Högberg <[email protected]>2018-02-13 09:55:47 +0100
commit68f53774b1340f07cf11caee773ff00d94904006 (patch)
treeb1868784c4ccea81a6d2c1a49af23ddaa663dde0 /lib/tools/test
parent5e7286acceec0811fd95898c7337921ac91c97b4 (diff)
parent9d660e81152fd7640e12551b09eebae1ebb87c98 (diff)
downloadotp-68f53774b1340f07cf11caee773ff00d94904006.tar.gz
otp-68f53774b1340f07cf11caee773ff00d94904006.tar.bz2
otp-68f53774b1340f07cf11caee773ff00d94904006.zip
Merge branch 'maint'
Diffstat (limited to 'lib/tools/test')
-rw-r--r--lib/tools/test/lcnt_SUITE.erl15
1 files changed, 13 insertions, 2 deletions
diff --git a/lib/tools/test/lcnt_SUITE.erl b/lib/tools/test/lcnt_SUITE.erl
index 146c915087..a79572a742 100644
--- a/lib/tools/test/lcnt_SUITE.erl
+++ b/lib/tools/test/lcnt_SUITE.erl
@@ -30,6 +30,8 @@
t_conflicts/1,
t_locations/1,
t_swap_keys/1,
+ t_implicit_start/1,
+ t_crash_before_collect/1,
smoke_lcnt/1]).
init_per_testcase(_Case, Config) ->
@@ -44,8 +46,8 @@ suite() ->
{timetrap,{minutes,4}}].
all() ->
- [t_load, t_conflicts, t_locations, t_swap_keys,
- smoke_lcnt].
+ [t_load, t_conflicts, t_locations, t_swap_keys, t_implicit_start,
+ t_crash_before_collect, smoke_lcnt].
%%----------------------------------------------------------------------
%% Tests
@@ -149,6 +151,15 @@ t_swap_keys_file([File|Files]) ->
ok = lcnt:stop(),
t_swap_keys_file(Files).
+%% Prior to OTP-14913 this would crash with 'noproc' as the lcnt server hadn't
+%% been started yet.
+t_implicit_start(Config) when is_list(Config) ->
+ ok = lcnt:conflicts().
+
+t_crash_before_collect(Config) when is_list(Config) ->
+ {ok, _} = lcnt:start(),
+ ok = lcnt:information().
+
%% Simple smoke test of actual lock-counting, if running on
%% a run-time with lock-counting enabled.
smoke_lcnt(Config) ->