Skip to content

skip copy of windows-gnu libs in check-only mode #276

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

Merged
bors merged 3 commits into from
Mar 25, 2020
Merged

skip copy of windows-gnu libs in check-only mode #276

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
8233827
skip copy of windows-gnu libs in check-only mode
RalfJung Mar 1, 2020
a1b360a
test cross-checking windows-gnu
RalfJung Mar 22, 2020
afed8fc
Fix typo
RalfJung Mar 25, 2020
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
2 changes: 1 addition & 1 deletion src/sysroot.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ version = "0.0.0"
let dst = rustlib.parent().join("lib");
util::mkdir(&dst)?;

if cmode.triple().contains("pc-windows-gnu") {
if cmode.triple().contains("pc-windows-gnu") && cargo_mode == XargoMode::Build {
let src = &sysroot
.path()
.join("lib")
Expand Down
13 changes: 9 additions & 4 deletions tests/smoke.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -347,10 +347,13 @@ impl HProject {
}

/// Runs `xargo-check` with the specified subcommand
fn xargo_check_subcommand(&self, subcommand: Option<&str>) -> Result<String> {
fn xargo_check_subcommand(&self, subcommand: Option<&str>, target: Option<&str>) -> Result<String> {
let mut cmd = xargo_check()?;
if let Some(subcommand) = subcommand {
cmd.args(&[subcommand]);
cmd.arg(subcommand);
}
if let Some(target) = target {
cmd.args(&["--target", target]);
}
cmd
.current_dir(self.td.path())
Expand Down Expand Up @@ -914,7 +917,7 @@ tag = "1.0.25"
fn cargo_check_check() {
fn run() -> Result<()> {
let project = HProject::new(false)?;
project.xargo_check_subcommand(Some("check"))?;
project.xargo_check_subcommand(Some("check"), None)?;

Ok(())
}
Expand All @@ -931,7 +934,9 @@ fn cargo_check_check_no_ctoml() {
std::fs::remove_file(project.td.path().join("Cargo.toml"))
.chain_err(|| format!("Could not remove Cargo.toml"))?;

let stderr = project.xargo_check_subcommand(None)?;
// windows-gnu specifically needs some extra files to be copied for full builds;
// make sure check-builds work without those files.
let stderr = project.xargo_check_subcommand(None, Some("i686-pc-windows-gnu"))?;
assert!(stderr.contains("Checking core"));

Ok(())
Expand Down