diff options
| author | Ingela Anderton Andin <[email protected]> | 2016-09-10 13:52:33 +0200 |
|---|---|---|
| committer | Ingela Anderton Andin <[email protected]> | 2016-09-10 13:52:33 +0200 |
| commit | e1ad19faba066d4d3d8c2796c6a95772a92fe1c4 (patch) | |
| tree | fb1afb9babfb8d83b5708fb2efa80b953a55569e | |
| parent | 3e80caeb232cfc01ca760393dac61767c94f6b6f (diff) | |
| parent | 736ce20a34ebe66fc2adc97e1f991de3f825e6e6 (diff) | |
| download | otp-e1ad19faba066d4d3d8c2796c6a95772a92fe1c4.tar.gz otp-e1ad19faba066d4d3d8c2796c6a95772a92fe1c4.tar.bz2 otp-e1ad19faba066d4d3d8c2796c6a95772a92fe1c4.zip | |
Merge branch 'ingela/diameter/cuddle-tests' into maint
* ingela/diameter/cuddle-tests:
diameter: Do not test SCTP on sparc-sun-solaris2.10
| -rw-r--r-- | lib/diameter/test/diameter_util.erl | 22 |
1 files changed, 15 insertions, 7 deletions
diff --git a/lib/diameter/test/diameter_util.erl b/lib/diameter/test/diameter_util.erl index 37fcbbc267..cca28dd23c 100644 --- a/lib/diameter/test/diameter_util.erl +++ b/lib/diameter/test/diameter_util.erl @@ -195,13 +195,21 @@ unique_string() -> %% have_sctp/0 have_sctp() -> - case gen_sctp:open() of - {ok, Sock} -> - gen_sctp:close(Sock), - true; - {error, E} when E == eprotonosupport; - E == esocktnosupport -> %% fail on any other reason - false + case erlang:system_info(system_architecture) of + %% We do not support the sctp version present in solaris + %% version "sparc-sun-solaris2.10", that behaves differently + %% from later versions and linux + "sparc-sun-solaris2.10" -> + false; + _-> + case gen_sctp:open() of + {ok, Sock} -> + gen_sctp:close(Sock), + true; + {error, E} when E == eprotonosupport; + E == esocktnosupport -> %% fail on any other reason + false + end end. %% --------------------------------------------------------------------------- |