From: Nathanael Jones <nathanael.jones@gmail.com>
Date: Tue, 7 Feb 2017 00:13:03 +0000 (-0700)
Subject: Rename test to fresh_builds_possible_with_multiple_metadata_overrides
X-Git-Tag: archive/raspbian/0.35.0-2+rpi1~3^2^2^2^2^2^2^2~22^2~9^2~163^2~6
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=6a749e3e9a342a5dfff49d53918eba348e10c836;p=cargo.git

Rename test to fresh_builds_possible_with_multiple_metadata_overrides
---

diff --git a/tests/build-script.rs b/tests/build-script.rs
index 1b56d0632..822063bf1 100644
--- a/tests/build-script.rs
+++ b/tests/build-script.rs
@@ -1782,7 +1782,7 @@ fn changing_an_override_invalidates() {
 }
 
 #[test]
-fn fresh_builds_possible_with_overrides() {
+fn fresh_builds_possible_with_multiple_metadata_overrides() {
     // The bug is non-deterministic. Sometimes you can get a fresh build
     let target = rustc_host();
     let p = project("foo")
@@ -1797,23 +1797,24 @@ fn fresh_builds_possible_with_overrides() {
         .file("src/lib.rs", "")
         .file(".cargo/config", &format!("
             [target.{}.foo]
-            rustc-link-lib = [\"foo\"]
-            rustc-cfg=[\"ossl102\"]
-            version = \"102\"
-            conf = \"\"
+            a = \"\"
+            b = \"\"
+            c = \"\"
+            d = \"\"
+            e = \"\"
         ", target))
         .file("build.rs", "");
  
     assert_that(p.cargo_process("build").arg("-v"),
                 execs().with_status(0).with_stderr("\
 [COMPILING] foo v0.5.0 ([..]
-[RUNNING] `rustc [..] -l foo`
+[RUNNING] `rustc [..]`
 [FINISHED] dev [unoptimized + debuginfo] target(s) in [..]
 "));
 
     sleep_ms(2000);
 
-    assert_that(p.cargo("build").arg("-v"),
+    assert_that(p.cargo("build").arg("-v").env("RUST_LOG", "cargo::ops::cargo_rustc::fingerprint=info"),
                 execs().with_status(0).with_stderr("\
 [FRESH] foo v0.5.0 ([..])
 [FINISHED] dev [unoptimized + debuginfo] target(s) in [..]