---

sfackler · sfackler · commit bd9f074c6251 · 2014-09-30T12:52:47.000-07:00
yaml --- r: 135929 b: refs/heads/try c: d2caea2 h: refs/heads/master i: 135927: 46811e5 v: v3
diff --git a/[refs] b/[refs]
@@ -2,7 +2,7 @@
 refs/heads/master: 8794107f74682607f368776cc8b78820629778e6
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: ae81c89f34f1ac2cdb596cf216612e94822a8466
-refs/heads/try: 448c8bf24e81d66083e26e81bbe4b2758f930436
+refs/heads/try: d2caea2beb9b645beb642c5657eb3e445386da28
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
 refs/heads/try2: 147ecfdd8221e4a4d4e090486829a06da1e0ca3c
diff --git a/branches/try/src/librustc_back/fs.rs b/branches/try/src/librustc_back/fs.rs
@@ -51,7 +51,7 @@ pub fn realpath(original: &Path) -> io::IoResult<Path> {
     return Ok(result);
 }
 
-#[cfg(not(windows), test)]
+#[cfg(all(not(windows), test))]
 mod test {
     use std::io;
     use std::io::fs::{File, symlink, mkdir, mkdir_recursive};
diff --git a/branches/try/src/librustc_back/rpath.rs b/branches/try/src/librustc_back/rpath.rs
@@ -147,7 +147,7 @@ fn minimize_rpaths(rpaths: &[String]) -> Vec<String> {
     minimized
 }
 
-#[cfg(unix, test)]
+#[cfg(all(unix, test))]
 mod test {
     use super::{RPathConfig};
     use super::{minimize_rpaths, rpaths_to_flags, get_rpath_relative_to_output};

Original file line number	Diff line number	Diff line change
`@@ -51,7 +51,7 @@ pub fn realpath(original: &Path) -> io::IoResult<Path> {`
`51`	`51`	`return Ok(result);`
`52`	`52`	`}`
`53`	`53`
`54`		`-#[cfg(not(windows), test)]`
	`54`	`+#[cfg(all(not(windows), test))]`
`55`	`55`	`mod test {`
`56`	`56`	`use std::io;`
`57`	`57`	`use std::io::fs::{File, symlink, mkdir, mkdir_recursive};`
Original file line number	Diff line number	Diff line change
`@@ -147,7 +147,7 @@ fn minimize_rpaths(rpaths: &[String]) -> Vec<String> {`
`147`	`147`	`minimized`
`148`	`148`	`}`
`149`	`149`
`150`		`-#[cfg(unix, test)]`
	`150`	`+#[cfg(all(unix, test))]`
`151`	`151`	`mod test {`
`152`	`152`	`use super::{RPathConfig};`
`153`	`153`	`use super::{minimize_rpaths, rpaths_to_flags, get_rpath_relative_to_output};`