Merge pull request #18 from Wind-River/bpang-runtest-2

simplify is_vxworks_pure_dynamic()
rust-lang · Sep 5, 2019 · 109e16e · 109e16e
2 parents 3a6f7b4 + bdc6cfc
commit 109e16e
Showing 1 changed file with 1 addition and 8 deletions.
diff --git a/src/tools/compiletest/src/runtest.rs b/src/tools/compiletest/src/runtest.rs
@@ -1733,14 +1733,7 @@ impl<'test> TestCx<'test> {
     }
 
     fn is_vxworks_pure_dynamic(&self) -> bool {
-        if self.config.target.contains("vxworks") {
-            match env::var("RUST_VXWORKS_TEST_DYLINK") {
-                Ok(s) => s == "1",
-                _ => false
-            }
-        } else {
-            false
-        }
+        self.config.target.contains("vxworks") && !self.is_vxworks_pure_static()
     }
 
     fn compose_and_run_compiler(&self, mut rustc: Command, input: Option<String>) -> ProcRes {