From: Alex Crichton <alex@alexcrichton.com>
Date: Wed, 14 Dec 2016 01:18:32 +0000 (-0800)
Subject: Fix compatibility with Rust nightly
X-Git-Tag: archive/raspbian/0.35.0-2+rpi1~3^2^2^2^2^2^2^2~22^2~11^2~85^2
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=b000ac67e10effee1923c11cc6f375ed8f3c75e2;p=cargo.git

Fix compatibility with Rust nightly

These two tests actually shouldn't have ever passed, but nightly Rust is more
principled about "$OUT_DIR" and doesn't leak it where possible, so these two
tests were accidentally compiling due to leaking '$OUT_DIR' for Cargo itself.
---

diff --git a/.travis.yml b/.travis.yml
index db5a62333..ed4d0e289 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -90,7 +90,7 @@ matrix:
            IMAGE=dist
            MAKE_TARGETS="test distcheck doc install uninstall"
            DEPLOY=0
-      rust: nightly-2016-11-26
+      rust: nightly
 
   exclude:
     - rust: stable
diff --git a/tests/build-script.rs b/tests/build-script.rs
index 01ea55f9a..a96d03ae6 100644
--- a/tests/build-script.rs
+++ b/tests/build-script.rs
@@ -2345,25 +2345,15 @@ fn assume_build_script_when_build_rs_present() {
             authors = []
         "#)
         .file("src/main.rs", r#"
-            use std::path::Path;
             fn main() {
-                let f = env!("OUT_DIR");
-                assert!(
-                    ! Path::new(f).join("output").exists()
-                );
+                if cfg!(foo) {
+                    panic!("the build script was run");
+                }
             }
         "#)
         .file("build.rs", r#"
-            use std::env;
-            use std::fs::File;
-            use std::io::Write;
-            use std::path::Path;
-
             fn main() {
-                let out_dir = env::var_os("OUT_DIR").unwrap();
-                let out_dir = Path::new(&out_dir).join("output");
-                let mut f = File::create(&out_dir).unwrap();
-                f.write_all(b"foo").unwrap();
+                println!("cargo:rustc-cfg=foo");
             }
         "#);
     p.build();
@@ -2390,25 +2380,15 @@ fn if_build_set_to_false_dont_treat_build_rs_as_build_script() {
             build = false
         "#)
         .file("src/main.rs", r#"
-            use std::path::Path;
             fn main() {
-                let f = env!("OUT_DIR");
-                assert!(
-                    ! Path::new(f).join("output").exists()
-                )
+                if cfg!(foo) {
+                    panic!("the build script was run");
+                }
             }
         "#)
         .file("build.rs", r#"
-            use std::env;
-            use std::fs::File;
-            use std::io::Write;
-            use std::path::Path;
-
             fn main() {
-                let out_dir = env::var_os("OUT_DIR").unwrap();
-                let out_dir = Path::new(&out_dir).join("output");
-                let mut f = File::create(&out_dir).unwrap();
-                f.write_all(b"foo").unwrap();
+                println!("cargo:rustc-cfg=foo");
             }
         "#);
     p.build();