From bdc6cfc96a181653d6747762027902097e43bd3f Mon Sep 17 00:00:00 2001
From: Baoshan Pang <baoshan.pang@windriver.com>
Date: Thu, 5 Sep 2019 11:26:29 -0700
Subject: [PATCH] simplify is_vxworks_pure_dynamic

---
 src/tools/compiletest/src/runtest.rs | 9 +--------
 1 file changed, 1 insertion(+), 8 deletions(-)

diff --git a/src/tools/compiletest/src/runtest.rs b/src/tools/compiletest/src/runtest.rs
index 84123cf32653..26fdfe9d1ef1 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 {