user0/rust
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #2 from Wind-River/bpang-runtest

Browse source 
Support static and dynamic linking mode for vxWorks in running test suite
This commit is contained in:
Baoshan 2019-08-21 08:27:56 -07:00 • committed by GitHub
commit b37d1073f6
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 17 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

18
src/tools/compiletest/src/runtest.rs
View file

@ -1725,6 +1725,17 @@ impl<'test> TestCx<'test> {
}
}
fn use_dynamic_linking(&self) -> bool {
if self.config.target.contains("vxworks") {
match env::var("RUST_TEST_DYLINK") {
Ok(s) => s == "1",
_ => false
}
} else {
true
}
}
fn compose_and_run_compiler(&self, mut rustc: Command, input: Option<String>) -> ProcRes {
let aux_dir = self.aux_output_dir_name();
@ -1768,6 +1779,7 @@ impl<'test> TestCx<'test> {
&& !self.config.host.contains("musl"))
|| self.config.target.contains("wasm32")
|| self.config.target.contains("nvptx")
|| !self.use_dynamic_linking()
{
// We primarily compile all auxiliary libraries as dynamic libraries
// to avoid code size bloat and large binaries as much as possible
@ -1999,10 +2011,14 @@ impl<'test> TestCx<'test> {
}
if !is_rustdoc {
if self.config.target == "wasm32-unknown-unknown" {
if self.config.target == "wasm32-unknown-unknown"
|| !self.use_dynamic_linking() {
// rustc.arg("-g"); // get any backtrace at all on errors
} else if !self.props.no_prefer_dynamic {
rustc.args(&["-C", "prefer-dynamic"]);
if self.config.target.contains("vxworks") {
rustc.args(&["-C", "target-feature=-crt-static"]);
}
}
}