diff options
| author | Baoshan <pangbw@gmail.com> | 2019-09-05 14:35:43 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-09-05 14:35:43 -0700 |
| commit | 109e16e8574a4fc47bf7c1d26b6000731002bc34 (patch) | |
| tree | 27222553812d4eef26294de6986407c3f968f1b6 /src | |
| parent | 3a6f7b4ac983537e10fbc4213475e920bd537102 (diff) | |
| parent | bdc6cfc96a181653d6747762027902097e43bd3f (diff) | |
| download | rust-109e16e8574a4fc47bf7c1d26b6000731002bc34.tar.gz rust-109e16e8574a4fc47bf7c1d26b6000731002bc34.zip | |
Merge pull request #18 from Wind-River/bpang-runtest-2
simplify is_vxworks_pure_dynamic()
Diffstat (limited to 'src')
| -rw-r--r-- | src/tools/compiletest/src/runtest.rs | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/src/tools/compiletest/src/runtest.rs b/src/tools/compiletest/src/runtest.rs index 84123cf3265..26fdfe9d1ef 100644 --- 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 { |