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/Makefile | |
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/Makefile')
-rw-r--r-- | lib/snmp/test/Makefile | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/lib/snmp/test/Makefile b/lib/snmp/test/Makefile index 7bc9dd07d4..a9bbe7fe62 100644 --- a/lib/snmp/test/Makefile +++ b/lib/snmp/test/Makefile @@ -2,7 +2,7 @@ # %CopyrightBegin% # -# Copyright Ericsson AB 1997-2012. All Rights Reserved. +# Copyright Ericsson AB 1997-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 @@ -36,7 +36,7 @@ VSN = $(SNMP_VSN) include modules.mk SNMP_ROOT = .. -SNMP_SUITE = snmp_SUITE +SNMP_SUITE = snmp_SUITE ERL_FILES = $(MODULES:%=%.erl) @@ -239,6 +239,7 @@ release_tests_spec: opt $(INSTALL_DATA) $(RELTEST_FILES) $(COVER_SPEC_FILE) "$(RELSYSDIR)" chmod -R u+w "$(RELSYSDIR)" tar cf - snmp_test_data | (cd "$(RELSYSDIR)"; tar xf -) + tar cf - *_SUITE_data | (cd "$(RELSYSDIR)"; tar xf -) release_docs_spec: |