Fix test_chdir when TMPDIR is a symlink

suppress some more unused variable warnings

Author: asomers

test/sys/test_wait.rs

@@ -6,6 +6,7 @@ use libc::exit;
 
 #[test]
 fn test_wait_signal() {
+    #[allow(unused_variables)]
     let m = ::FORK_MTX.lock().expect("Mutex got poisoned by another test");
 
     match fork() {
@@ -17,11 +18,11 @@ fn test_wait_signal() {
       // panic, fork should never fail unless there is a serious problem with the OS
       Err(_) => panic!("Error: Fork Failed")
     }
-    drop(m);    // Appease the unused_variable checker
 }
 
 #[test]
 fn test_wait_exit() {
+    #[allow(unused_variables)]
     let m = ::FORK_MTX.lock().expect("Mutex got poisoned by another test");
 
     match fork() {
@@ -32,5 +33,4 @@ fn test_wait_exit() {
       // panic, fork should never fail unless there is a serious problem with the OS
       Err(_) => panic!("Error: Fork Failed")
     }
-    drop(m);    // Appease the unused_variable checker
 }

test/test_unistd.rs

@@ -155,6 +155,7 @@ fn test_fchdir() {
     // fchdir changes the process's cwd
     #[allow(unused_variables)]
     let m = ::CWD_MTX.lock().expect("Mutex got poisoned by another test");
+
     let tmpdir = TempDir::new("test_fchdir").unwrap();
     let tmpdir_path = tmpdir.path().canonicalize().unwrap();
     let tmpdir_fd = File::open(&tmpdir_path).unwrap().into_raw_fd();
@@ -170,15 +171,17 @@ fn test_getcwd() {
     // chdir changes the process's cwd
     #[allow(unused_variables)]
     let m = ::CWD_MTX.lock().expect("Mutex got poisoned by another test");
-    let tmp_dir = TempDir::new("test_getcwd").unwrap();
-    assert!(chdir(tmp_dir.path()).is_ok());
-    assert_eq!(getcwd().unwrap(), tmp_dir.path());
+
+    let tmpdir = TempDir::new("test_getcwd").unwrap();
+    let tmpdir_path = tmpdir.path().canonicalize().unwrap();
+    assert!(chdir(&tmpdir_path).is_ok());
+    assert_eq!(getcwd().unwrap(), tmpdir_path);
 
     // make path 500 chars longer so that buffer doubling in getcwd
     // kicks in.  Note: One path cannot be longer than 255 bytes
     // (NAME_MAX) whole path cannot be longer than PATH_MAX (usually
     // 4096 on linux, 1024 on macos)
-    let mut inner_tmp_dir = tmp_dir.path().to_path_buf();
+    let mut inner_tmp_dir = tmpdir_path.to_path_buf();
     for _ in 0..5 {
         let newdir = iter::repeat("a").take(100).collect::<String>();
         inner_tmp_dir.push(newdir);