Merge pull request #1038 from xanathar/pr/macos-unit-tests

Fixed unit tests under macOS and possibly other *nix flavors
gtk-rs · Mar 5, 2023 · 60946b7 · 60946b7
2 parents 7b79419 + c1057ec
commit 60946b7
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 8 deletions.
diff --git a/gio/src/socket.rs b/gio/src/socket.rs
@@ -925,12 +925,7 @@ mod tests {
 
         let mut fds = [0 as libc::c_int; 2];
         let (out_sock, in_sock) = unsafe {
-            let ret = libc::socketpair(
-                libc::AF_UNIX,
-                libc::SOCK_STREAM | libc::SOCK_CLOEXEC,
-                0,
-                fds.as_mut_ptr(),
-            );
+            let ret = libc::socketpair(libc::AF_UNIX, libc::SOCK_STREAM, 0, fds.as_mut_ptr());
             if ret != 0 {
                 panic!("{}", io::Error::last_os_error());
             }

diff --git a/glib/src/translate.rs b/glib/src/translate.rs
@@ -2812,10 +2812,10 @@ mod tests {
         // gives us useful results
         let dir_1 = tmp_dir.join("abcd");
         fs::create_dir(&dir_1).unwrap();
-        assert_eq!(crate::path_get_basename(&dir_1), Path::from("abcd"));
+        assert_eq!(crate::path_get_basename(&dir_1), Path::new("abcd"));
         assert_eq!(
             crate::path_get_basename(dir_1.canonicalize().unwrap()),
-            Path::from("abcd")
+            Path::new("abcd")
         );
         assert_eq!(
             crate::path_get_dirname(dir_1.canonicalize().unwrap()),