diff options
| author | John Högberg <[email protected]> | 2018-02-28 09:10:05 +0100 |
|---|---|---|
| committer | John Högberg <[email protected]> | 2018-02-28 09:10:05 +0100 |
| commit | 3b62e9dde9153fe8dcc1f1f5bfa97b7cb591c901 (patch) | |
| tree | f5e6f5022fad4038f65070a7f6588a1654eb3776 /lib/kernel | |
| parent | 1e5df276a60b0968833a8483cf4a219b3dc5639e (diff) | |
| parent | b600910bf17c92721fb8da04e8c508d6395dabc4 (diff) | |
| download | otp-3b62e9dde9153fe8dcc1f1f5bfa97b7cb591c901.tar.gz otp-3b62e9dde9153fe8dcc1f1f5bfa97b7cb591c901.tar.bz2 otp-3b62e9dde9153fe8dcc1f1f5bfa97b7cb591c901.zip | |
Merge branch 'maint'
* maint:
Skip testing unavailable interfaces in inet_SUITE:getifaddrs
Make re_SUITE:sub_binaries less unstable
Diffstat (limited to 'lib/kernel')
| -rw-r--r-- | lib/kernel/test/inet_SUITE.erl | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/lib/kernel/test/inet_SUITE.erl b/lib/kernel/test/inet_SUITE.erl index 3b502be8b8..ba0d075ef2 100644 --- a/lib/kernel/test/inet_SUITE.erl +++ b/lib/kernel/test/inet_SUITE.erl @@ -1083,11 +1083,9 @@ ifaddrs([{If,Opts}|IOs]) -> #ifopts{flags=F} = Ifopts = check_ifopts(Opts, #ifopts{name=If}), case F of {flags,Flags} -> - case lists:member(up, Flags) of - true -> - Ifopts#ifopts.addrs; - false -> - [] + case lists:member(running, Flags) of + true -> Ifopts#ifopts.addrs; + false -> [] end ++ ifaddrs(IOs); undefined -> ifaddrs(IOs) |