summary refs log tree commit diff
path: root/src/libtest
diff options
context:
space:
mode:
authorNiels Sascha Reedijk <niels.reedijk@gmail.com>2016-09-24 23:38:56 -0500
committerAlexander von Gluck IV <kallisti5@unixzen.com>2016-09-25 11:12:23 -0500
commit1a6fc8b7b840fb381b1aefa35b9b3d4c736bae50 (patch)
tree0e05d41032bc801ce69ce359645da9a437260469 /src/libtest
parent2d1d4d199471dbdf0828acbc06cfe452463569af (diff)
downloadrust-1a6fc8b7b840fb381b1aefa35b9b3d4c736bae50.tar.gz
rust-1a6fc8b7b840fb381b1aefa35b9b3d4c736bae50.zip
Add support for the Haiku operating system on x86 and x86_64 machines
* Hand rebased from Niels original work on 1.9.0
Diffstat (limited to 'src/libtest')
-rw-r--r--src/libtest/lib.rs6
1 files changed, 6 insertions, 0 deletions
diff --git a/src/libtest/lib.rs b/src/libtest/lib.rs
index 2b4193306dd..cf7af97dc7a 100644
--- a/src/libtest/lib.rs
+++ b/src/libtest/lib.rs
@@ -1080,6 +1080,12 @@ fn get_concurrency() -> usize {
         }
         cpus as usize
     }
+
+    #[cfg(target_os = "haiku")]
+    fn num_cpus() -> usize {
+        // TODO: implement
+        1
+    }
 }
 
 pub fn filter_tests(opts: &TestOpts, tests: Vec<TestDescAndFn>) -> Vec<TestDescAndFn> {