Commit e5b7d9f
committed
Auto merge of #1984 - jclulow:illumos-fixups, r=JohnTitor
illumos fixups
I needed `TCP_MAXSEG` for use with 0.3.x of [socket2](https://github.com/alexchrichton/socket2-rs), and while I was there I figured I would add the rest of the TCP socket options we have on illumos. Many of these are common with Solaris, but some are not; I have attempted to put them in the correct place so that they will only be active where they are valid.
The other commit in this PR gags the test for `setservent()` and `endservent()`, which on illumos have some complexity with respect to return types under different compilation conditions.
I don't have an Oracle Solaris system on which to test, but on my relatively current illumos system the tests pass:
```
$ (cd libc-test && CC_x86_64_unknown_illumos=clang AR_x86_64_unknown_illumos=gar cargo test)
Compiling libc v0.2.80 (/ws/safari/libc)
Compiling libc-test v0.1.0 (/ws/safari/libc/libc-test)
Finished test [unoptimized + debuginfo] target(s) in 12.45s
Running /ws/safari/libc/target/debug/deps/cmsg-9ceed5ee937b4c5f
running 5 tests
test t::test_cmsg_data ... ok
test t::test_cmsg_firsthdr ... ok
test t::test_cmsg_len ... ok
test t::test_cmsg_space ... ok
test t::test_cmsg_nxthdr ... ok
test result: ok. 5 passed; 0 failed; 0 ignored; 0 measured; 0 filtered out
Running /ws/safari/libc/target/debug/deps/errqueue-70aa763a9ed1f681
running 0 tests
test result: ok. 0 passed; 0 failed; 0 ignored; 0 measured; 0 filtered out
Running /ws/safari/libc/target/debug/deps/linux_elf-534b101b72339f59
PASSED 0 tests
Running /ws/safari/libc/target/debug/deps/linux_fcntl-4dca948e65c4e2bb
PASSED 0 tests
Running /ws/safari/libc/target/debug/deps/linux_ipv6-74ce6ee23c41bad1
PASSED 0 tests
Running /ws/safari/libc/target/debug/deps/linux_strerror_r-c7705986f4a1d214
PASSED 0 tests
Running /ws/safari/libc/target/debug/deps/linux_termios-690bf406ed77f8a9
PASSED 0 tests
Running /ws/safari/libc/target/debug/deps/main-0b8735d9db2c09ba
RUNNING ALL TESTS
PASSED 6543 tests
```3 files changed
+24
-1
lines changed| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
866 | 866 | | |
867 | 867 | | |
868 | 868 | | |
| 869 | + | |
| 870 | + | |
| 871 | + | |
| 872 | + | |
| 873 | + | |
869 | 874 | | |
870 | 875 | | |
871 | 876 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
25 | 25 | | |
26 | 26 | | |
27 | 27 | | |
| 28 | + | |
28 | 29 | | |
29 | 30 | | |
30 | 31 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
1385 | 1385 | | |
1386 | 1386 | | |
1387 | 1387 | | |
1388 | | - | |
| 1388 | + | |
| 1389 | + | |
| 1390 | + | |
| 1391 | + | |
| 1392 | + | |
| 1393 | + | |
| 1394 | + | |
| 1395 | + | |
| 1396 | + | |
| 1397 | + | |
| 1398 | + | |
| 1399 | + | |
| 1400 | + | |
| 1401 | + | |
| 1402 | + | |
| 1403 | + | |
| 1404 | + | |
| 1405 | + | |
1389 | 1406 | | |
1390 | 1407 | | |
1391 | 1408 | | |
| |||
0 commit comments