Skip to content

Commit f5e2390

Browse files
authored
Rollup merge of rust-lang#63179 - BaoshanPang:testcases, r=alexcrichton
update test cases for vxWorks issue-2214.rs: lgamma is lgamma on vxWorks ignore process-envs.rs and process-remove-from-env.rs as there is no 'env' on vxWorks
2 parents 7a7fcad + 8d93778 commit f5e2390

File tree

3 files changed

+6
-1
lines changed

3 files changed

+6
-1
lines changed

src/test/ui/issues/issue-2214.rs

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,12 +25,15 @@ mod m {
2525

2626
#[link_name = "m"]
2727
extern {
28-
#[cfg(any(unix, target_os = "cloudabi"))]
28+
#[cfg(any(all(unix, not(target_os = "vxworks")), target_os = "cloudabi"))]
2929
#[link_name="lgamma_r"]
3030
pub fn lgamma(n: c_double, sign: &mut c_int) -> c_double;
3131
#[cfg(windows)]
3232
#[link_name="lgamma"]
3333
pub fn lgamma(n: c_double, sign: &mut c_int) -> c_double;
34+
#[cfg(target_os = "vxworks")]
35+
#[link_name="lgamma"]
36+
pub fn lgamma(n: c_double, sign: &mut c_int) -> c_double;
3437
}
3538
}
3639

src/test/ui/process/process-envs.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
// ignore-cloudabi no processes
33
// ignore-emscripten no processes
44
// ignore-sgx no processes
5+
// ignore-vxworks no 'env'
56

67
use std::process::Command;
78
use std::env;

src/test/ui/process/process-remove-from-env.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
// ignore-cloudabi no processes
33
// ignore-emscripten no processes
44
// ignore-sgx no processes
5+
// ignore-vxworks no 'env'
56

67
use std::process::Command;
78
use std::env;

0 commit comments

Comments
 (0)