diff options
| author | Baoshan <pangbw@gmail.com> | 2019-09-04 08:26:22 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-09-04 08:26:22 -0700 |
| commit | 3a6f7b4ac983537e10fbc4213475e920bd537102 (patch) | |
| tree | bd9a6e5e9ac53c09deac1120babd5d1e661053ec | |
| parent | e316ba3b60433bd703575a00d7fd5e344e29912d (diff) | |
| parent | 20b9ea88c7360bfbcf76021db568463deb158bc1 (diff) | |
| download | rust-3a6f7b4ac983537e10fbc4213475e920bd537102.tar.gz rust-3a6f7b4ac983537e10fbc4213475e920bd537102.zip | |
Merge pull request #15 from Wind-River/bpang-runtest
change RUST_TEST_DYLINK to RUST_VXWORKS_TEST_DYLINK
| -rw-r--r-- | src/tools/compiletest/src/runtest.rs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/tools/compiletest/src/runtest.rs b/src/tools/compiletest/src/runtest.rs index cba51f0065c..84123cf3265 100644 --- a/src/tools/compiletest/src/runtest.rs +++ b/src/tools/compiletest/src/runtest.rs @@ -1723,7 +1723,7 @@ impl<'test> TestCx<'test> { fn is_vxworks_pure_static(&self) -> bool { if self.config.target.contains("vxworks") { - match env::var("RUST_TEST_DYLINK") { + match env::var("RUST_VXWORKS_TEST_DYLINK") { Ok(s) => s != "1", _ => true } @@ -1734,7 +1734,7 @@ impl<'test> TestCx<'test> { fn is_vxworks_pure_dynamic(&self) -> bool { if self.config.target.contains("vxworks") { - match env::var("RUST_TEST_DYLINK") { + match env::var("RUST_VXWORKS_TEST_DYLINK") { Ok(s) => s == "1", _ => false } |