diff options
author | Erlang/OTP <[email protected]> | 2014-08-07 17:36:26 +0200 |
---|---|---|
committer | Erlang/OTP <[email protected]> | 2014-08-07 17:36:26 +0200 |
commit | 6828c2ed8fdd5f19cad002a7dae07dd5f1c4409c (patch) | |
tree | d86469ff46b5b7a53f85f245963e1084f8bd3710 /lib/snmp/test/snmp_test_lib.hrl | |
parent | f68b689662dcfba7f6e82bad03938eeb3a48a300 (diff) | |
parent | e910f8568a4d19093f7ea8c6865367c3e73703f0 (diff) | |
download | otp-6828c2ed8fdd5f19cad002a7dae07dd5f1c4409c.tar.gz otp-6828c2ed8fdd5f19cad002a7dae07dd5f1c4409c.tar.bz2 otp-6828c2ed8fdd5f19cad002a7dae07dd5f1c4409c.zip |
Merge branch 'raimo/snmp/ipv4+ipv6/OTP-12020' into maint-17
* refs/heads/fetch-and-merge.maint-17-opu/FETCH_HEAD/54676: (46 commits)
Fix error printouts to not crash
Improve ct_snmp test cases
Fix misspelled community in manager
Rearrange test suite group structure
Fix testcase for really dual ip
Adjust test cases for daily builds
Fix call to non-existent function
Fix test manager in agent tests for IPv6
Call new Net-SNMP test suite from top suite
Improve external snmp commands args
Test inform to dual transports
Write list of trap targets
Improve dual stack test suite
Use {ipv6_v6only, true}
Remove commented out code
Add dual_ip tests in snmp_to_snmpnet_SUITE
Silence logging from agent net_if at shutdown
Rewrite agent for IPv4 + IPv6
snmp: Add inform test
snmp: Add new test suite
...
Diffstat (limited to 'lib/snmp/test/snmp_test_lib.hrl')
-rw-r--r-- | lib/snmp/test/snmp_test_lib.hrl | 19 |
1 files changed, 10 insertions, 9 deletions
diff --git a/lib/snmp/test/snmp_test_lib.hrl b/lib/snmp/test/snmp_test_lib.hrl index 8cc3f75dc5..9b7609b831 100644 --- a/lib/snmp/test/snmp_test_lib.hrl +++ b/lib/snmp/test/snmp_test_lib.hrl @@ -1,5 +1,5 @@ %%<copyright> -%% <year>2002-2008</year> +%% <year>2002-2014</year> %% <holder>Ericsson AB, All Rights Reserved</holder> %%</copyright> %%<legalnotice> @@ -32,14 +32,15 @@ -define(APPLICATION, snmp). -endif. --define(SCONF(K,D,C), snmp_test_lib:set_config(K,D,C)). --define(GCONF(K,C), snmp_test_lib:get_config(K,C)). --define(RCONF(K,C,V), snmp_test_lib:replace_config(K,C,V)). --define(HOSTNAME(N), snmp_test_lib:hostname(N)). --define(LOCALHOST(), snmp_test_lib:localhost()). --define(SZ(X), snmp_test_lib:sz(X)). --define(OSTYPE(), snmp_test_lib:os_type()). --define(DISPLAY_SUITE_INFO(), snmp_test_lib:display_suite_info(?MODULE)). +-define(SCONF(K,D,C), snmp_test_lib:set_config(K,D,C)). +-define(GCONF(K,C), snmp_test_lib:get_config(K,C)). +-define(RCONF(K,C,V), snmp_test_lib:replace_config(K,C,V)). +-define(HOSTNAME(N), snmp_test_lib:hostname(N)). +-define(LOCALHOST(), snmp_test_lib:localhost()). +-define(LOCALHOST(Family), snmp_test_lib:localhost(Family)). +-define(SZ(X), snmp_test_lib:sz(X)). +-define(OSTYPE(), snmp_test_lib:os_type()). +-define(DISPLAY_SUITE_INFO(), snmp_test_lib:display_suite_info(?MODULE)). %% - Test case macros - |