snmp: Patch 1125

    OTP-8478  [agent] Added very basic support for multiple SNMPv3 EngineIDs
              in a single agent.

1 files changed, 16 insertions, 6 deletions

diff --git a/lib/snmp/test/snmp_test_lib.erl b/lib/snmp/test/snmp_test_lib.erl
index 2586b66a13..54839d989b 100644
--- a/lib/snmp/test/snmp_test_lib.erl
+++ b/lib/snmp/test/snmp_test_lib.erl
@@ -1,19 +1,19 @@
 %% 
 %% %CopyrightBegin%
-%% 
-%% Copyright Ericsson AB 2002-2009. All Rights Reserved.
-%% 
+%%
+%% Copyright Ericsson AB 2002-2010. 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
 %% compliance with the License. You should have received a copy of the
 %% Erlang Public License along with this software. If not, it can be
 %% retrieved online at http://www.erlang.org/.
-%% 
+%%
 %% Software distributed under the License is distributed on an "AS IS"
 %% basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
 %% the License for the specific language governing rights and limitations
 %% under the License.
-%% 
+%%
 %% %CopyrightEnd%
 %% 
 
@@ -172,7 +172,17 @@ os_based_skip(Skippable) when is_list(Skippable) ->
                 {value, {OsFam, OsName}} ->
                     true;
                 {value, {OsFam, OsNames}} when is_list(OsNames) ->
-                    lists:member(OsName, OsNames);
+                    case lists:member(OsName, OsNames) of
+			true ->
+			    true;
+			false ->
+			    case lists:keymember(OsName, 1, OsNames) of
+				{value, {OsName, Check}} when is_function(Check) ->
+				    Check();
+				_ ->
+				    false
+			    end
+		    end;
                 _ ->
                     false
             end