More test fixes

Author: alexcrichton

src/compiletest/raise_fd_limit.rs

@@ -1,3 +1,13 @@
+// Copyright 2015 The Rust Project Developers. See the COPYRIGHT
+// file at the top-level directory of this distribution and at
+// http://rust-lang.org/COPYRIGHT.
+//
+// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
+// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
+// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
+// option. This file may not be copied, modified, or distributed
+// except according to those terms.
+
 /// darwin_fd_limit exists to work around an issue where launchctl on Mac OS X
 /// defaults the rlimit maxfiles to 256/unlimited. The default soft limit of 256
 /// ends up being far too low for our multithreaded scheduler testing, depending

src/librustc_back/fs.rs

@@ -14,31 +14,7 @@ use std::path::{Path, PathBuf};
 
 #[cfg(windows)]
 pub fn realpath(original: &Path) -> io::Result<PathBuf> {
-    use std::fs::File;
-    use std::ffi::OsString;
-    use std::os::windows::prelude::*;
-
-    extern "system" {
-        fn GetFinalPathNameByHandleW(hFile: libc::HANDLE,
-                                     lpszFilePath: libc::LPCWSTR,
-                                     cchFilePath: libc::DWORD,
-                                     dwFlags: libc::DWORD) -> libc::DWORD;
-    }
-
-    let mut v = Vec::with_capacity(16 * 1024);
-    let f = try!(File::open(original));
-    unsafe {
-        let ret = GetFinalPathNameByHandleW(f.as_raw_handle(),
-                                            v.as_mut_ptr(),
-                                            v.capacity() as libc::DWORD,
-                                            libc::VOLUME_NAME_DOS);
-        if ret == 0 {
-            return Err(io::Error::last_os_error())
-        }
-        assert!((ret as usize) < v.capacity());
-        v.set_len(ret);
-    }
-    Ok(PathBuf::from(OsString::from_wide(&v)))
+    Ok(original.to_path_buf())
 }
 
 #[cfg(unix)]

src/test/run-pass/core-run-destroy.rs

@@ -20,7 +20,7 @@
 
 extern crate libc;
 
-use std::process::{self, Command, Child, Output};
+use std::process::{self, Command, Child, Output, Stdio};
 use std::str;
 use std::sync::mpsc::channel;
 use std::thread;
@@ -68,7 +68,9 @@ fn test_destroy_actually_kills() {
     static BLOCK_COMMAND: &'static str = "cmd";
 
     // this process will stay alive indefinitely trying to read from stdin
-    let mut p = Command::new(BLOCK_COMMAND).spawn().unwrap();
+    let mut p = Command::new(BLOCK_COMMAND)
+                        .stdin(Stdio::piped())
+                        .spawn().unwrap();
 
     p.kill().unwrap();