Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
41 changes: 41 additions & 0 deletions .github/workflows/integration-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -609,3 +609,44 @@ jobs:
${SCCACHE_PATH} --show-stats

${SCCACHE_PATH} --show-stats | grep -e "Cache hits\s*[1-9]"

rust-test-coverage:
runs-on: ubuntu-latest
needs: build

env:
RUSTC_WRAPPER: /home/runner/.cargo/bin/sccache
CARGO_INCREMENTAL: "0"
RUSTFLAGS: "-Zprofile -Ccodegen-units=1 -Copt-level=0 -Clink-dead-code -Coverflow-checks=off -Zpanic_abort_tests -Cpanic=abort"
RUSTDOCFLAGS: "-Cpanic=abort"

steps:
- uses: actions/download-artifact@v3
with:
name: integration-tests
path: /home/runner/.cargo/bin/
- name: Chmod for binary
run: chmod +x ${SCCACHE_PATH}

- name: Prepare
run: |
rustup toolchain install nightly
cargo new coverage-test
cd coverage-test
echo "serde = { version = \"1.0\", features = [\"derive\"] }" >> Cargo.toml

- name: "Coverage test #1"
working-directory: ./coverage-test
run: cargo clean && cargo +nightly test

- name: Output
run: ${SCCACHE_PATH} --show-stats

- name: "Coverage test #2"
working-directory: ./coverage-test
run: cargo clean && cargo +nightly test

- name: Output
run: |
${SCCACHE_PATH} --show-stats
${SCCACHE_PATH} --show-stats | grep -e "Cache hits\s*[1-9]"
34 changes: 26 additions & 8 deletions src/compiler/rust.rs
Original file line number Diff line number Diff line change
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>,
/// 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,
optional: true,
},
);
}
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