about summary refs log tree commit diff
diff options
context:
space:
mode:
authorPietro Albini <pietro@pietroalbini.org>2019-08-01 16:00:31 +0200
committerGitHub <noreply@github.com>2019-08-01 16:00:31 +0200
commitf5e2390e2f05e6f4fb98e3b7b0f6978d802d602c (patch)
tree809a5af0db38d458c111a48ba1f3ee595909096f
parent7a7fcad675a142d930b6d5ca6a3bf9de7805b463 (diff)
parent8d9377822de8207e7a63002837abece28f754994 (diff)
downloadrust-f5e2390e2f05e6f4fb98e3b7b0f6978d802d602c.tar.gz
rust-f5e2390e2f05e6f4fb98e3b7b0f6978d802d602c.zip
Rollup merge of #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
-rw-r--r--src/test/ui/issues/issue-2214.rs5
-rw-r--r--src/test/ui/process/process-envs.rs1
-rw-r--r--src/test/ui/process/process-remove-from-env.rs1
3 files changed, 6 insertions, 1 deletions
diff --git a/src/test/ui/issues/issue-2214.rs b/src/test/ui/issues/issue-2214.rs
index 22f33545cb9..c4c56cd109d 100644
--- a/src/test/ui/issues/issue-2214.rs
+++ b/src/test/ui/issues/issue-2214.rs
@@ -25,12 +25,15 @@ mod m {
 
     #[link_name = "m"]
     extern {
-        #[cfg(any(unix, target_os = "cloudabi"))]
+        #[cfg(any(all(unix, not(target_os = "vxworks")), target_os = "cloudabi"))]
         #[link_name="lgamma_r"]
         pub fn lgamma(n: c_double, sign: &mut c_int) -> c_double;
         #[cfg(windows)]
         #[link_name="lgamma"]
         pub fn lgamma(n: c_double, sign: &mut c_int) -> c_double;
+        #[cfg(target_os = "vxworks")]
+        #[link_name="lgamma"]
+        pub fn lgamma(n: c_double, sign: &mut c_int) -> c_double;
     }
 }
 
diff --git a/src/test/ui/process/process-envs.rs b/src/test/ui/process/process-envs.rs
index a7779c55f1f..62a4733f89a 100644
--- a/src/test/ui/process/process-envs.rs
+++ b/src/test/ui/process/process-envs.rs
@@ -2,6 +2,7 @@
 // ignore-cloudabi no processes
 // ignore-emscripten no processes
 // ignore-sgx no processes
+// ignore-vxworks no 'env'
 
 use std::process::Command;
 use std::env;
diff --git a/src/test/ui/process/process-remove-from-env.rs b/src/test/ui/process/process-remove-from-env.rs
index 32cbb6ac85a..3fee9e2abb9 100644
--- a/src/test/ui/process/process-remove-from-env.rs
+++ b/src/test/ui/process/process-remove-from-env.rs
@@ -2,6 +2,7 @@
 // ignore-cloudabi no processes
 // ignore-emscripten no processes
 // ignore-sgx no processes
+// ignore-vxworks no 'env'
 
 use std::process::Command;
 use std::env;