Introduce force-inprocess feature

Author: nox

.travis.yml

@@ -7,5 +7,13 @@ os:
   - linux
   - osx
 
+env:
+  - FEATURES=""
+  - FEATURES="--features force-inprocess"
+
 notifications:
   webhooks: http://build.servo.org:54856/travis
+
+script:
+  - cargo build $FEATURES
+  - cargo test $FEATURES

Cargo.toml

@@ -6,14 +6,15 @@ authors = ["The Servo Project Developers"]
 license = "MIT/Apache-2.0"
 repository = "https://github.com/servo/ipc-channel"
 
+[features]
+force-inprocess = []
+
 [dependencies]
 bincode = "0.6"
 lazy_static = "0.2"
 libc = "0.2.12"
 rand = "0.3"
 serde = "0.8"
-
-[target.'cfg(any(target_os = "windows", target_os = "android"))'.dependencies]
 uuid = {version = "0.3", features = ["v4"]}
 
 [dev-dependencies]

src/lib.rs

@@ -7,7 +7,8 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-#![cfg_attr(any(target_os="windows", target_os="android"), feature(mpsc_select))]
+#![cfg_attr(any(feature = "force-inprocess", target_os = "windows", target_os = "android"),
+			feature(mpsc_select))]
 
 #[macro_use]
 extern crate lazy_static;
@@ -16,7 +17,8 @@ extern crate bincode;
 extern crate libc;
 extern crate rand;
 extern crate serde;
-#[cfg(any(target_os = "windows", target_os = "android"))] extern crate uuid;
+#[cfg(any(feature = "force-inprocess", target_os = "windows", target_os = "android"))]
+extern crate uuid;
 
 pub mod ipc;
 pub mod platform;

src/platform/mod.rs

@@ -8,13 +8,13 @@
 // except according to those terms.
 
 mod os {
-    #[cfg(target_os = "linux")]
+    #[cfg(all(not(feature = "force-inprocess"), target_os = "linux"))]
     include!("linux/mod.rs");
 
-    #[cfg(target_os = "macos")]
+    #[cfg(all(not(feature = "force-inprocess"), target_os = "macos"))]
     include!("macos/mod.rs");
 
-    #[cfg(any(target_os = "windows", target_os = "android"))]
+    #[cfg(any(feature = "force-inprocess", target_os = "windows", target_os = "android"))]
     include!("inprocess/mod.rs");
 }
 

src/platform/test.rs

@@ -14,7 +14,7 @@ use std::sync::Arc;
 use std::time::{Duration, Instant};
 use std::thread;
 
-#[cfg(not(windows))]
+#[cfg(not(any(feature = "force-inprocess", target_os = "windows", target_os = "android")))]
 use test::{fork, Wait};
 
 #[test]
@@ -173,6 +173,7 @@ fn big_data_with_sender_transfer() {
     thread.join().unwrap();
 }
 
+#[cfg(all(not(feature = "force-inprocess"), target_os = "linux"))]
 fn with_n_fds(n: usize, size: usize) {
     let (sender_fds, receivers): (Vec<_>, Vec<_>) = (0..n).map(|_| platform::channel().unwrap())
                                                     .map(|(tx, rx)| (OsIpcChannel::Sender(tx), rx))
@@ -204,7 +205,7 @@ fn with_n_fds(n: usize, size: usize) {
 }
 
 // These tests only apply to platforms that need fragmentation.
-#[cfg(target_os="linux")]
+#[cfg(all(not(feature = "force-inprocess"), target_os = "linux"))]
 mod fragment_tests {
     use platform;
     use super::with_n_fds;
@@ -392,9 +393,9 @@ fn receiver_set() {
     }
 }
 
+#[cfg(not(any(feature = "force-inprocess", target_os = "windows", target_os = "android")))]
 #[test]
-//XXXjdm This hangs indefinitely on appveyor and warrants further investigation.
-#[cfg(not(windows))]
+//XXXjdm This hangs indefinitely with inprocess impl and warrants further investigation.
 fn server() {
     let (server, name) = OsIpcOneShotServer::new().unwrap();
     let data: &[u8] = b"1234567";
@@ -411,8 +412,7 @@ fn server() {
                (data, vec![], vec![]));
 }
 
-///XXXjdm Windows' libc doesn't include fork.
-#[cfg(not(windows))]
+#[cfg(not(any(feature = "force-inprocess", target_os = "windows", target_os = "android")))]
 #[test]
 fn cross_process() {
     let (server, name) = OsIpcOneShotServer::new().unwrap();
@@ -432,8 +432,7 @@ fn cross_process() {
                (data, vec![], vec![]));
 }
 
-///XXXjdm Windows' libc doesn't include fork.
-#[cfg(not(windows))]
+#[cfg(not(any(feature = "force-inprocess", target_os = "windows", target_os = "android")))]
 #[test]
 fn cross_process_sender_transfer() {
     let (server, name) = OsIpcOneShotServer::new().unwrap();

src/test.rs

@@ -18,8 +18,7 @@ use std::sync::Arc;
 use std::sync::mpsc::{self, Sender};
 use std::thread;
 
-///XXXjdm Windows' libc doesn't include fork.
-#[cfg(not(windows))]
+#[cfg(not(any(feature = "force-inprocess", target_os = "windows", target_os = "android")))]
 // I'm not actually sure invoking this is indeed unsafe -- but better safe than sorry...
 pub unsafe fn fork<F: FnOnce()>(child_func: F) -> libc::pid_t {
     match libc::fork() {
@@ -129,9 +128,8 @@ fn select() {
     }
 }
 
+#[cfg(not(any(feature = "force-inprocess", target_os = "windows", target_os = "android")))]
 #[test]
-///XXXjdm Windows' libc doesn't include fork.
-#[cfg(not(windows))]
 fn cross_process_embedded_senders() {
     let person = ("Patrick Walton".to_owned(), 29);
     let (server0, server0_name) = IpcOneShotServer::new().unwrap();