diff options
| author | bors <bors@rust-lang.org> | 2019-07-16 19:26:53 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2019-07-16 19:26:53 +0000 |
| commit | 07e0c3651ce2a7b326f7678e135d8d5bbbbe5d18 (patch) | |
| tree | ba78fffd2729c8ef04ef1d258aacb9e4efebf91b /src/tools | |
| parent | 96234d5363286700794973c36178c3df1d9d49d6 (diff) | |
| parent | 4c0c0f6158b464ee5070b32bb37f2863d0eff012 (diff) | |
| download | rust-07e0c3651ce2a7b326f7678e135d8d5bbbbe5d18.tar.gz rust-07e0c3651ce2a7b326f7678e135d8d5bbbbe5d18.zip | |
Auto merge of #61946 - BaoshanPang:vxworks, r=alexcrichton
port rust for vxWorks The supporting for vxWorks has been enabled in this branch. Although there are still a lots of work to do, I would like to upstream the code and fix the problems later. Please let me know if there is anything I have to do before upstream the code. r? @alexcrichton Thanks, Baoshan
Diffstat (limited to 'src/tools')
| -rw-r--r-- | src/tools/compiletest/src/runtest.rs | 12 | ||||
| -rw-r--r-- | src/tools/compiletest/src/util.rs | 1 |
2 files changed, 13 insertions, 0 deletions
diff --git a/src/tools/compiletest/src/runtest.rs b/src/tools/compiletest/src/runtest.rs index 35caf82dd71..66fbe3c7037 100644 --- a/src/tools/compiletest/src/runtest.rs +++ b/src/tools/compiletest/src/runtest.rs @@ -1653,6 +1653,18 @@ impl<'test> TestCx<'test> { None, ) } + _ 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()); + self.compose_and_run( + vx_run, + self.config.run_lib_path.to_str().unwrap(), + Some(aux_dir.to_str().unwrap()), + None, + ) + } _ => { let aux_dir = self.aux_output_dir_name(); let ProcArgs { prog, args } = self.make_run_args(); diff --git a/src/tools/compiletest/src/util.rs b/src/tools/compiletest/src/util.rs index 8caf5ca00f5..76099b950b0 100644 --- a/src/tools/compiletest/src/util.rs +++ b/src/tools/compiletest/src/util.rs @@ -30,6 +30,7 @@ const OS_TABLE: &'static [(&'static str, &'static str)] = &[ ("solaris", "solaris"), ("win32", "windows"), ("windows", "windows"), + ("vxworks", "vxworks"), ]; const ARCH_TABLE: &'static [(&'static str, &'static str)] = &[ |
