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

BaoshanPang · web-flow · commit 109e16e8574a · 2019-09-05T14:35:43.000-07:00
simplify is_vxworks_pure_dynamic()
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 {

Original file line number	Diff line number	Diff line change
`@@ -1733,14 +1733,7 @@ impl<'test> TestCx<'test> {`
`1733`	`1733`	`}`
`1734`	`1734`
`1735`	`1735`	`fn is_vxworks_pure_dynamic(&self) -> bool {`
`1736`		`- if self.config.target.contains("vxworks") {`
`1737`		`- match env::var("RUST_VXWORKS_TEST_DYLINK") {`
`1738`		`- Ok(s) => s == "1",`
`1739`		`- _ => false`
`1740`		`- }`
`1741`		`- } else {`
`1742`		`- false`
`1743`		`- }`
	`1736`	`+ self.config.target.contains("vxworks") && !self.is_vxworks_pure_static()`
`1744`	`1737`	`}`
`1745`	`1738`
`1746`	`1739`	`fn compose_and_run_compiler(&self, mut rustc: Command, input: Option<String>) -> ProcRes {`