Merge branch 'bmk/snmp/snmp419_integration/OTP-9068' into dev

* [compiler] Added support for textual convention AGENT-CAPABILITIES
  and full support for textual convention MODULE-COMPLIANCE:
  OTP-8966
* [agent] Added a "complete" set of (snmp) table and variable
  print functions:
  OTP-8977
* [agent] For is_set_ok and set operations on the table
  vacmAccessTable, all values of the vacmAccessSecurityModel
  column was incorrectly translated into any:
  OTP-8980
* [agent] Reconfigure of SNMP-VIEW-BASED-ACM-MIB could after
  a change in the vacm config file (vacm.conf):
  OTP-8981
* [compiler] Added a MIB compiler (frontend) escript, snmpc:
  OTP-9004

1 files changed, 41 insertions, 82 deletions

diff --git a/lib/snmp/test/snmp_SUITE.erl b/lib/snmp/test/snmp_SUITE.erl
index 3f6473893b..b6d72da2fa 100644
--- a/lib/snmp/test/snmp_SUITE.erl
+++ b/lib/snmp/test/snmp_SUITE.erl
@@ -1,7 +1,7 @@
 %% 
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 1997-2010. All Rights Reserved.
+%% Copyright Ericsson AB 1997-2011. 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
@@ -19,26 +19,14 @@
 
 -module(snmp_SUITE).
 
--export([all/0, suite/0,groups/0,init_per_suite/1, end_per_suite/1, init_per_group/2,end_per_group/2, 
+-export([all/0, 
+	 suite/0,
+	 groups/0, 
+	 init_per_suite/1,    end_per_suite/1, 
+	 init_per_group/2,    end_per_group/2, 
 	 init_per_testcase/2, end_per_testcase/2
 	]).
 
--export([]).
-
--export([
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-]).
 
 %%
 %% -----
@@ -54,39 +42,43 @@ end_per_testcase(_Case, Config) when is_list(Config) ->
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %% Top test case
 
-suite() -> [{ct_hooks,[ts_install_cth]}].
+suite() -> 
+    [{ct_hooks, [ts_install_cth]}].
 
 all() -> 
-[{group, app}, {group, compiler}, {group, misc},
- {group, agent}, {group, manager}].
+    [{group, app}, 
+     {group, compiler}, 
+     {group, misc},
+     {group, agent}, 
+     {group, manager}].
 
 groups() -> 
-    [{app, [], [{group, app_test}, {group, appup_test}]},
- {compiler, [], [{group, compiler_test}]},
- {misc, [],
-  [{group, conf_test}, {group, pdus_test},
-   {group, log_test}, {group, note_store_test}]},
- {agent, [],
-  [{group, mibs_test}, {group, nfilter_test},
-   {group, agent_test}]},
- {manager, [],
-  [{group, manager_config_test},
-   {group, manager_user_test}, {group, manager_test}]},
- {app_test, [], [{snmp_app_test, all}]},
- {appup_test, [], [{snmp_appup_test, all}]},
- {compiler_test, [], [{snmp_compiler_test, all}]},
- {conf_test, [], [{snmp_conf_test, all}]},
- {pdus_test, [], [{snmp_pdus_test, all}]},
- {log_test, [], [{snmp_log_test, all}]},
- {note_store_test, [], [{snmp_note_store_test, all}]},
- {mibs_test, [], [{snmp_agent_mibs_test, all}]},
- {nfilter_test, [], [{snmp_agent_nfilter_test, all}]},
- {agent_test, [], [{snmp_agent_test, all}]},
- {manager_config_test, [],
-  [{snmp_manager_config_test, all}]},
- {manager_user_test, [],
-  [{snmp_manager_user_test, all}]},
- {manager_test, [], [{snmp_manager_test, all}]}].
+    [{app,      [], [{group, app_test}, 
+		     {group, appup_test}]},
+     {compiler, [], [{group, compiler_test}]},
+     {misc,     [], [{group, conf_test}, 
+		     {group, pdus_test},
+		     {group, log_test}, 
+		     {group, note_store_test}]},
+     {agent, [],    [{group, mibs_test}, 
+		     {group, nfilter_test},
+		     {group, agent_test}]},
+     {manager, [],  [{group, manager_config_test},
+		     {group, manager_user_test}, 
+		     {group, manager_test}]},
+     {app_test,            [], [{snmp_app_test,            all}]},
+     {appup_test,          [], [{snmp_appup_test,          all}]},
+     {compiler_test,       [], [{snmp_compiler_test,       all}]},
+     {conf_test,           [], [{snmp_conf_test,           all}]},
+     {pdus_test,           [], [{snmp_pdus_test,           all}]},
+     {log_test,            [], [{snmp_log_test,            all}]},
+     {note_store_test,     [], [{snmp_note_store_test,     all}]},
+     {mibs_test,           [], [{snmp_agent_mibs_test,     all}]},
+     {nfilter_test,        [], [{snmp_agent_nfilter_test,  all}]},
+     {agent_test,          [], [{snmp_agent_test,          all}]},
+     {manager_config_test, [], [{snmp_manager_config_test, all}]},
+     {manager_user_test,   [], [{snmp_manager_user_test,   all}]},
+     {manager_test,        [], [{snmp_manager_test,        all}]}].
 
 init_per_suite(Config) ->
     Config.
@@ -95,41 +87,8 @@ end_per_suite(_Config) ->
     ok.
 
 init_per_group(_GroupName, Config) ->
-	Config.
+    Config.
 
 end_per_group(_GroupName, Config) ->
-	Config.
-
-
-
-
-
-
-
-
-
-
-
-  
-
-  
-
-  
-
-  
-
-  
-
-
-
-
-
-
-
-  
-
-  
-
-  
-
+    Config.