Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix: rust coverage test meets compile error for missing debuginfo #1740

Merged
merged 9 commits into from Apr 24, 2023
Merged

fix: rust coverage test meets compile error for missing debuginfo #1740

Changes from 3 commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
30b616e
ignore file not found error
yihau Apr 20, 2023
b9fb161
Revert "ignore file not found error"
yihau Apr 20, 2023
42eac8c
make gcno as optional files in rust compiler
yihau Apr 20, 2023
639976b
fix redundant clone
yihau Apr 20, 2023
d505f65
add integration test, issues-1652
yihau Apr 20, 2023
adcec3a
make test more general
yihau Apr 21, 2023
3e0a326
move env to job level
yihau Apr 21, 2023
9bbf8b4
test coverage twice and print status
yihau Apr 21, 2023
10b37a7
fix working directory
yihau Apr 21, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
34 changes: 26 additions & 8 deletions src/compiler/rust.rs
View file
Open in desktop
Expand Up @@ -15,8 +15,8 @@
use crate::cache::FileObjectSource;
use crate::compiler::args::*;
use crate::compiler::{
Cacheable, ColorMode, Compilation, CompileCommand, Compiler, CompilerArguments, CompilerHasher,
CompilerKind, CompilerProxy, HashResult,
c::ArtifactDescriptor, Cacheable, ColorMode, Compilation, CompileCommand, Compiler,
CompilerArguments, CompilerHasher, CompilerKind, CompilerProxy, HashResult,
};
#[cfg(feature = "dist-client")]
use crate::compiler::{DistPackagers, OutputsRewriter};
Expand Down Expand Up @@ -186,7 +186,7 @@ pub struct RustCompilation {
/// The compiler inputs.
inputs: Vec<PathBuf>,
/// The compiler outputs.
outputs: HashMap<String, PathBuf>,
outputs: HashMap<String, ArtifactDescriptor>,
Xuanwo marked this conversation as resolved.
Show resolved Hide resolved
/// The directories searched for rlibs
crate_link_paths: Vec<PathBuf>,
/// The crate name being compiled.
Expand Down Expand Up @@ -1513,19 +1513,37 @@ where
.into_iter()
.map(|o| {
let p = output_dir.join(&o);
(o, p)
(
o,
ArtifactDescriptor {
path: p,
optional: false,
},
)
})
.collect::<HashMap<_, _>>();
let dep_info = if let Some(dep_info) = dep_info {
let p = output_dir.join(&dep_info);
outputs.insert(dep_info.to_string_lossy().into_owned(), p.clone());
outputs.insert(
dep_info.to_string_lossy().into_owned(),
ArtifactDescriptor {
path: p.clone(),
optional: false,
},
);
Some(p)
} else {
None
};
if let Some(gcno) = gcno {
let p = output_dir.join(&gcno);
outputs.insert(gcno.to_string_lossy().into_owned(), p);
outputs.insert(
gcno.to_string_lossy().into_owned(),
ArtifactDescriptor {
path: p.clone(),
optional: true,
},
);
Xuanwo marked this conversation as resolved.
Show resolved Hide resolved
}
let mut arguments = arguments;
// Request color output unless json was requested. The client will strip colors if needed.
Expand Down Expand Up @@ -1761,8 +1779,8 @@ impl Compilation for RustCompilation {
fn outputs<'a>(&'a self) -> Box<dyn Iterator<Item = FileObjectSource> + 'a> {
Box::new(self.outputs.iter().map(|(k, v)| FileObjectSource {
key: k.to_string(),
path: v.clone(),
optional: false,
path: v.path.clone(),
optional: v.optional,
}))
}
}
Expand Down