aboutsummaryrefslogtreecommitdiffstats
path: root/lib/kernel
diff options
context:
space:
mode:
authorRaimo Niskanen <[email protected]>2018-12-06 10:45:13 +0100
committerRaimo Niskanen <[email protected]>2018-12-06 10:45:13 +0100
commitcd4a7568315a50822fca79239ce04adbdc1774ae (patch)
tree968bcb97c9a30b57fcbe8e060c0aef94e86d66c0 /lib/kernel
parent32d28de92aea46967b7c0c4d805b453b3a4759e8 (diff)
parent5fd6d9a8b13530d7201fdadfd840add08697f380 (diff)
downloadotp-cd4a7568315a50822fca79239ce04adbdc1774ae.tar.gz
otp-cd4a7568315a50822fca79239ce04adbdc1774ae.tar.bz2
otp-cd4a7568315a50822fca79239ce04adbdc1774ae.zip
Merge branch 'raimo/test-cuddling' into maint
* raimo/test-cuddling: Rewrite to work for stream connection Update Linux version for pktoptions TTL
Diffstat (limited to 'lib/kernel')
-rw-r--r--lib/kernel/test/gen_tcp_misc_SUITE.erl3
1 files changed, 2 insertions, 1 deletions
diff --git a/lib/kernel/test/gen_tcp_misc_SUITE.erl b/lib/kernel/test/gen_tcp_misc_SUITE.erl
index c47de58fae..244bd7e2a0 100644
--- a/lib/kernel/test/gen_tcp_misc_SUITE.erl
+++ b/lib/kernel/test/gen_tcp_misc_SUITE.erl
@@ -1998,8 +1998,9 @@ recvttl_ok({unix,darwin}, OSVer) -> not semver_lt(OSVer, {19,0,0});
%% Using the option returns einval, so it is not implemented.
recvttl_ok({unix,freebsd}, OSVer) -> not semver_lt(OSVer, {11,2,0});
recvttl_ok({unix,sunos}, OSVer) -> not semver_lt(OSVer, {5,12,0});
+%% Does not return any value - not implemented for pktoptions
+recvttl_ok({unix,linux}, OSVer) -> not semver_lt(OSVer, {2,7,0});
%%
-recvttl_ok({unix,linux}, _) -> true;
recvttl_ok({unix,_}, _) -> true;
recvttl_ok(_, _) -> false.