File tree 4 files changed +1
-40
lines changed
4 files changed +1
-40
lines changed Original file line number Diff line number Diff line change @@ -39,9 +39,6 @@ The remaining architectures look like:
39
39
then otherwise runs tests normally.
40
40
* iOS builds need an extra linker flag currently, but beyond that they're built
41
41
as standard as everything else.
42
- * The rumprun target builds an entire kernel from the test suite and then runs
43
- it inside QEMU using the serial console to test whether it succeeded or
44
- failed.
45
42
* The BSD builds, currently OpenBSD and FreeBSD, use QEMU to boot up a system
46
43
and compile/run tests. More information on that below.
47
44
@@ -62,10 +59,6 @@ however. This strategy is used for all Linux architectures that aren't intel.
62
59
Note that one downside of this QEMU system is that threads are barely
63
60
implemented, so we're careful to not spawn many threads.
64
61
65
- For the rumprun target the only output is a kernel image, so we just use that
66
- plus the ` rumpbake ` command to create a full kernel image which is then run from
67
- within QEMU.
68
-
69
62
Finally, the fun part, the BSDs. Quite a few hoops are jumped through to get CI
70
63
working for these platforms, but the gist of it looks like:
71
64
Original file line number Diff line number Diff line change @@ -969,7 +969,6 @@ fn test_solarish(target: &str) {
969
969
970
970
fn test_netbsd ( target : & str ) {
971
971
assert ! ( target. contains( "netbsd" ) ) ;
972
- let rumprun = target. contains ( "rumprun" ) ;
973
972
let mut cfg = ctest_cfg ( ) ;
974
973
975
974
cfg. flag ( "-Wno-deprecated-declarations" ) ;
@@ -1146,26 +1145,6 @@ fn test_netbsd(target: &str) {
1146
1145
"setrlimit" | "setrlimit64" | // non-int in 1st arg
1147
1146
"prlimit" | "prlimit64" | // non-int in 2nd arg
1148
1147
1149
- // These functions presumably exist on netbsd but don't look like
1150
- // they're implemented on rumprun yet, just let them slide for now.
1151
- // Some of them look like they have headers but then don't have
1152
- // corresponding actual definitions either...
1153
- "shm_open" |
1154
- "shm_unlink" |
1155
- "syscall" |
1156
- "mq_open" |
1157
- "mq_close" |
1158
- "mq_getattr" |
1159
- "mq_notify" |
1160
- "mq_receive" |
1161
- "mq_send" |
1162
- "mq_setattr" |
1163
- "mq_timedreceive" |
1164
- "mq_timedsend" |
1165
- "mq_unlink" |
1166
- "ptrace" |
1167
- "sigaltstack" if rumprun => true ,
1168
-
1169
1148
_ => false ,
1170
1149
}
1171
1150
} ) ;
Original file line number Diff line number Diff line change @@ -1568,10 +1568,7 @@ pub const IPPROTO_VRRP: ::c_int = 112;
1568
1568
/// Common Address Resolution Protocol
1569
1569
pub const IPPROTO_CARP : :: c_int = 112 ;
1570
1570
/// L2TPv3
1571
- // TEMP: Disabled for now; this constant was added to NetBSD on 2017-02-16,
1572
- // but isn't yet supported by the NetBSD rumprun kernel image used for
1573
- // libc testing.
1574
- //pub const IPPROTO_L2TP: ::c_int = 115;
1571
+ pub const IPPROTO_L2TP : :: c_int = 115 ;
1575
1572
/// SCTP
1576
1573
pub const IPPROTO_SCTP : :: c_int = 132 ;
1577
1574
/// PFSYNC
Original file line number Diff line number Diff line change @@ -346,14 +346,6 @@ cfg_if! {
346
346
} else if #[ cfg( target_os = "emscripten" ) ] {
347
347
#[ link( name = "c" ) ]
348
348
extern { }
349
- } else if #[ cfg( all( target_os = "netbsd" ,
350
- feature = "rustc-dep-of-std" ,
351
- target_vendor = "rumprun" ) ) ] {
352
- // Since we don't use -nodefaultlibs on Rumprun, libc is always pulled
353
- // in automatically by the linker. We avoid passing it explicitly, as it
354
- // causes some versions of binutils to crash with an assertion failure.
355
- #[ link( name = "m" ) ]
356
- extern { }
357
349
} else if #[ cfg( any( target_os = "macos" ,
358
350
target_os = "ios" ,
359
351
target_os = "watchos" ,
You can’t perform that action at this time.
0 commit comments