about summary refs log tree commit diff
path: root/src/tools
diff options
context:
space:
mode:
authorBaoshan Pang <baoshan.pang@windriver.com>2019-08-12 10:46:57 -0700
committerBaoshan Pang <baoshan.pang@windriver.com>2019-08-13 22:07:43 -0700
commitf161efac2bb37b40d4082256ca776ca2dbc7c0e6 (patch)
tree1e7589e142dd65f5b8acfbfd735c4aa9caa11a5a /src/tools
parent60960a260f7b5c695fd0717311d72ce62dd4eb43 (diff)
downloadrust-f161efac2bb37b40d4082256ca776ca2dbc7c0e6.tar.gz
rust-f161efac2bb37b40d4082256ca776ca2dbc7c0e6.zip
1. support crt-static
2. change armv7_wrs_vxworks to armv7_wrs_vxworks_eabihf.
3. use wr-** instead of vx-**
4. set PIE to false
5. code cleanup
Diffstat (limited to 'src/tools')
-rw-r--r--src/tools/compiletest/src/runtest.rs6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/tools/compiletest/src/runtest.rs b/src/tools/compiletest/src/runtest.rs
index 05cfdf1ce53..3da6be74129 100644
--- a/src/tools/compiletest/src/runtest.rs
+++ b/src/tools/compiletest/src/runtest.rs
@@ -1659,10 +1659,10 @@ impl<'test> TestCx<'test> {
             _ if self.config.target.contains("vxworks") => {
                 let aux_dir = self.aux_output_dir_name();
                 let ProcArgs { prog, args } = self.make_run_args();
-                let mut vx_run = Command::new("vx-run");
-                vx_run.args(&[&prog]).args(args).envs(env.clone());
+                let mut wr_run = Command::new("wr-run");
+                wr_run.args(&[&prog]).args(args).envs(env.clone());
                 self.compose_and_run(
-                    vx_run,
+                    wr_run,
                     self.config.run_lib_path.to_str().unwrap(),
                     Some(aux_dir.to_str().unwrap()),
                     None,