diff --git a/src/cargo/mod.rs b/src/cargo/mod.rs index 4b3cf15f0..837b0ba9b 100644 --- a/src/cargo/mod.rs +++ b/src/cargo/mod.rs @@ -6,7 +6,7 @@ use serialize::{Decoder}; use std::fmt; use std::fmt::{Show,Formatter}; -mod util; +pub mod util; #[deriving(Decodable,Encodable,Eq,Clone,Ord)] pub struct Manifest { diff --git a/src/cargo/util/mod.rs b/src/cargo/util/mod.rs index 2e840da0d..352b45227 100644 --- a/src/cargo/util/mod.rs +++ b/src/cargo/util/mod.rs @@ -1,6 +1,2 @@ -//pub use self::process_builder::process; -//mod process_builder; - -pub fn process(cmd: &str) -> &'static str { - "ohai" -} +pub use self::process_builder::process; +mod process_builder; diff --git a/src/cargo/util/process_builder.rs b/src/cargo/util/process_builder.rs index b05359d58..e45063f04 100644 --- a/src/cargo/util/process_builder.rs +++ b/src/cargo/util/process_builder.rs @@ -9,7 +9,7 @@ pub struct ProcessBuilder { } impl ProcessBuilder { - fn args(mut self, arguments: &[~str]) -> ProcessBuilder { + pub fn args(mut self, arguments: &[~str]) -> ProcessBuilder { self.args = arguments.to_owned(); self } @@ -19,7 +19,7 @@ pub fn process(cmd: &str) -> ProcessBuilder { ProcessBuilder { program: cmd.to_owned(), args: ~[], path: get_curr_path() } } -fn get_curr_path() -> ~[~str] { +pub fn get_curr_path() -> ~[~str] { os::getenv("PATH").map(|path| { path.split(std::path::SEP).map(|seg| seg.to_owned()).collect() }).unwrap_or(~[]) diff --git a/tests/test_cargo_compile.rs b/tests/test_cargo_compile.rs index 8594d320c..466853675 100644 --- a/tests/test_cargo_compile.rs +++ b/tests/test_cargo_compile.rs @@ -1,4 +1,5 @@ use support::project; +use cargo; fn setup() {