diff options
| author | Marcus Arendt <[email protected]> | 2014-08-08 15:04:28 +0200 |
|---|---|---|
| committer | Marcus Arendt <[email protected]> | 2014-08-08 15:04:28 +0200 |
| commit | 05c8a2f9ba5c93985fb64a63f19ed4de22560829 (patch) | |
| tree | 89253eecdf161489dd68ee35ae584c99ab373443 /lib/snmp/test/snmp_test_lib.erl | |
| parent | 07b86000da9f50be61fe3fa04ac530c0cf8930d9 (diff) | |
| parent | e189bae81fbc873d3349b9dec12ef234daf9d8ad (diff) | |
| download | otp-05c8a2f9ba5c93985fb64a63f19ed4de22560829.tar.gz otp-05c8a2f9ba5c93985fb64a63f19ed4de22560829.tar.bz2 otp-05c8a2f9ba5c93985fb64a63f19ed4de22560829.zip | |
Merge branch 'maint'
Conflicts:
OTP_VERSION
Diffstat (limited to 'lib/snmp/test/snmp_test_lib.erl')
| -rw-r--r-- | lib/snmp/test/snmp_test_lib.erl | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/lib/snmp/test/snmp_test_lib.erl b/lib/snmp/test/snmp_test_lib.erl index fbb891e40d..5e611340a3 100644 --- a/lib/snmp/test/snmp_test_lib.erl +++ b/lib/snmp/test/snmp_test_lib.erl @@ -1,7 +1,7 @@ %% %% %CopyrightBegin% %% -%% Copyright Ericsson AB 2002-2013. All Rights Reserved. +%% Copyright Ericsson AB 2002-2014. All Rights Reserved. %% %% The contents of this file are subject to the Erlang Public License, %% Version 1.1, (the "License"); you may not use this file except in @@ -22,7 +22,7 @@ -include_lib("kernel/include/file.hrl"). --export([hostname/0, hostname/1, localhost/0, os_type/0, sz/1, +-export([hostname/0, hostname/1, localhost/0, localhost/1, os_type/0, sz/1, display_suite_info/1]). -export([non_pc_tc_maybe_skip/4, os_based_skip/1]). -export([fix_data_dir/1, @@ -60,6 +60,9 @@ from(_H, []) -> []. localhost() -> {ok, Ip} = snmp_misc:ip(net_adm:localhost()), Ip. +localhost(Family) -> + {ok, Ip} = snmp_misc:ip(net_adm:localhost(), Family), + Ip. sz(L) when is_list(L) -> length(L); |