diff options
author | Björn-Egil Dahlberg <[email protected]> | 2016-05-20 18:07:49 +0200 |
---|---|---|
committer | Björn-Egil Dahlberg <[email protected]> | 2016-05-20 18:07:49 +0200 |
commit | 761b3bb5f48e5c9df401debc4e3cc63457410f2e (patch) | |
tree | 6d7e674057633f967d59b77a00a6717672e760c2 /erts | |
parent | 2098d573b097566d598ded1444625439ee6c0ae3 (diff) | |
download | otp-761b3bb5f48e5c9df401debc4e3cc63457410f2e.tar.gz otp-761b3bb5f48e5c9df401debc4e3cc63457410f2e.tar.bz2 otp-761b3bb5f48e5c9df401debc4e3cc63457410f2e.zip |
erts: Check for carrier capability specifically in test
Diffstat (limited to 'erts')
-rw-r--r-- | erts/emulator/test/lttng_SUITE.erl | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/erts/emulator/test/lttng_SUITE.erl b/erts/emulator/test/lttng_SUITE.erl index efc79f42ed..c64ddc40da 100644 --- a/erts/emulator/test/lttng_SUITE.erl +++ b/erts/emulator/test/lttng_SUITE.erl @@ -120,7 +120,7 @@ t_lttng_list(_Config) -> %% com_ericsson_otp:carrier_pool_get %% com_ericsson_otp:carrier_pool_put t_carrier_pool(Config) -> - case have_carriers() of + case have_carriers(ets_alloc) of false -> {skip, "No Memory Carriers configured on system."}; true -> @@ -137,7 +137,7 @@ t_carrier_pool(Config) -> %% com_ericsson_otp:carrier_destroy %% com_ericsson_otp:carrier_create t_memory_carrier(Config) -> - case have_carriers() of + case have_carriers(ets_alloc) of false -> {skip, "No Memory Carriers configured on system."}; true -> @@ -446,11 +446,10 @@ load_driver(Dir, Driver) -> %% check -have_carriers() -> - Cap = element(3,erlang:system_info(allocator)), - case Cap -- [sys_alloc,sys_aligned_alloc] of - [] -> false; - _ -> true +have_carriers(Alloc) -> + case erlang:system_info({allocator,Alloc}) of + false -> false; + _ -> true end. have_async_threads() -> |