Ignore CARGO_MAKEFLAGS when calculating Rust hash keys. Fixes mozilla…

…#193

Since cargo gained jobserver support it now passes a CARGO_MAKEFLAGS
environment variable which is different for every build (it contains file
descriptor numbers or semaphore values). sccache uses all environment
variables starting with `CARGO_` as inputs to the hash key for Rust compilation
so this broke things. I think it was mostly only a problem on Windows,
where the values were semaphores. On POSIX platforms the values are file
descriptors, which are probably likely to be the same between runs of cargo.

This change also adds a test for compiling a simple Rust crate with
cargo and verifying that we get a cache hit. I pulled in the `assert_cli`
crate to write that test, which worked nicely.

Cargo.toml

@@ -60,6 +60,7 @@ which = "1.0"
 zip = { version = "0.2", default-features = false }
 
 [dev-dependencies]
+assert_cli = "0.5"
 gcc = "0.3"
 itertools = "0.6"
 
@@ -85,3 +86,4 @@ unstable = []
 debug = true
 
 [workspace]
+exclude = ["tests/test-crate"]

src/compiler/rust.rs

@@ -33,7 +33,7 @@ use std::process::{self, Stdio};
 use std::time::Instant;
 use tempdir::TempDir;
 use util::{fmt_duration_as_secs, run_input_output, Digest};
-use util::HashToDigest;
+use util::{HashToDigest, OsStrExt};
 
 use errors::*;
 
@@ -636,7 +636,8 @@ impl<T> CompilerHasher<T> for RustHasher
             let mut env_vars = env_vars.clone();
             env_vars.sort();
             for &(ref var, ref val) in env_vars.iter() {
-                if var.to_str().map(|s| s.starts_with("CARGO_")).unwrap_or(false) {
+                // CARGO_MAKEFLAGS will have jobserver info which is extremely non-cacheable.
+                if var.starts_with("CARGO_") && var != "CARGO_MAKEFLAGS" {
                     var.hash(&mut HashToDigest { digest: &mut m });
                     m.update(b"=");
                     val.hash(&mut HashToDigest { digest: &mut m });

tests/sccache_cargo.rs

@@ -0,0 +1,104 @@
+//! System tests for compiling Rust code with cargo.
+//!
+//! Any copyright is dedicated to the Public Domain.
+//! http://creativecommons.org/publicdomain/zero/1.0/
+
+extern crate assert_cli;
+extern crate chrono;
+extern crate env_logger;
+#[macro_use]
+extern crate log;
+extern crate tempdir;
+
+use std::env;
+use std::fs;
+use std::path::{Path, PathBuf};
+use std::process::{Command, Stdio};
+
+use assert_cli::{Assert, Environment};
+use env_logger::LogBuilder;
+use chrono::Local;
+use tempdir::TempDir;
+
+fn find_sccache_binary() -> PathBuf {
+    // Older versions of cargo put the test binary next to the sccache binary.
+    // Newer versions put it in the deps/ subdirectory.
+    let exe = env::current_exe().unwrap();
+    let this_dir = exe.parent().unwrap();
+    let dirs = &[&this_dir, &this_dir.parent().unwrap()];
+    dirs
+        .iter()
+        .map(|d| d.join("sccache").with_extension(env::consts::EXE_EXTENSION))
+        .filter_map(|d| fs::metadata(&d).ok().map(|_| d))
+        .next()
+        .expect(&format!("Error: sccache binary not found, looked in `{:?}`. Do you need to run `cargo build`?", dirs))
+}
+
+fn stop(sccache: &Path) {
+    //TODO: should be able to use Assert::ignore_status when that is released.
+    let output = Command::new(&sccache)
+        .arg("--stop-server")
+        .stdout(Stdio::null())
+        .stderr(Stdio::null())
+        .output()
+        .unwrap();
+    trace!("stop-server returned {}", output.status);
+}
+
+/// Test that building a simple Rust crate with cargo using sccache results in a cache hit
+/// when built a second time.
+#[test]
+fn test_rust_cargo() {
+    drop(LogBuilder::new()
+         .format(|record| {
+             format!("{} [{}] - {}",
+                     Local::now().format("%Y-%m-%dT%H:%M:%S%.3f"),
+                     record.level(),
+                     record.args())
+         })
+        .parse(&env::var("RUST_LOG").unwrap_or_default())
+        .init());
+    let cargo = env!("CARGO");
+    debug!("cargo: {}", cargo);
+    let sccache = find_sccache_binary();
+    debug!("sccache: {:?}", sccache);
+    let crate_dir = Path::new(file!()).parent().unwrap().join("test-crate");
+    // Ensure there's no existing sccache server running.
+    trace!("sccache --stop-server");
+    stop(&sccache);
+    // Create a temp directory to use for the disk cache.
+    let tempdir = TempDir::new("sccache_test_rust_cargo").unwrap();
+    let env = Environment::inherit().insert("SCCACHE_DIR", tempdir.path());
+    // Start a new sccache server.
+    trace!("sccache --start-server");
+    Assert::command(&[&sccache.to_string_lossy()])
+        .with_args(&["--start-server"]).with_env(env).succeeds().unwrap();
+    // `cargo clean` first, just to be sure there's no leftover build objects.
+    let env = Environment::inherit().insert("RUSTC_WRAPPER", &sccache);
+    let a = Assert::command(&[&cargo])
+        .with_args(&["clean"]).with_env(&env).current_dir(&crate_dir).succeeds();
+    trace!("cargo clean: {:?}", a);
+    a.unwrap();
+    // Now build the crate with cargo.
+    let a = Assert::command(&[&cargo])
+        .with_args(&["build"]).with_env(&env).current_dir(&crate_dir).succeeds();
+    trace!("cargo build: {:?}", a);
+    a.unwrap();
+    // Clean it so we can build it again.
+    let a = Assert::command(&[&cargo])
+        .with_args(&["clean"]).with_env(&env).current_dir(&crate_dir).succeeds();
+    trace!("cargo clean: {:?}", a);
+    a.unwrap();
+    let a = Assert::command(&[&cargo])
+        .with_args(&["build"]).with_env(&env).current_dir(&crate_dir).succeeds();
+    trace!("cargo build: {:?}", a);
+    a.unwrap();
+    // Now get the stats and ensure that we had a cache hit for the second build.
+    trace!("sccache --show-stats");
+    Assert::command(&[&sccache.to_string_lossy()])
+        .with_args(&["--show-stats", "--stats-format=json"])
+        .stdout().contains(r#""cache_hits":1"#).succeeds().execute()
+        .expect("Should have had 1 cache hit");
+    trace!("sccache --stop-server");
+    stop(&sccache);
+}

tests/test-crate/Cargo.toml

@@ -0,0 +1,6 @@
+[package]
+name = "test-crate"
+version = "0.1.0"
+authors = ["Ted Mielczarek <ted@mielczarek.org>"]
+
+[dependencies]

tests/test-crate/src/lib.rs

@@ -0,0 +1,7 @@
+#[cfg(test)]
+mod tests {
+    #[test]
+    fn it_works() {
+        assert_eq!(2 + 2, 4);
+    }
+}