Merge branch 'issue_57'

Fixes #57

Cargo.toml

@@ -20,7 +20,7 @@ fallible-iterator = "0.1.3"
 memmap = "0.5.2"
 object = "0.4"
 rustc-demangle = "0.1.4"
-cargo = "0.21.1"
+cargo = "0.22"
 clap = "2"
 serde = "1.0.2"
 serde_json = "1.0.2"

src/config.rs

@@ -66,6 +66,8 @@ pub struct Config {
     pub features: Vec<String>,
     /// Packages to include when building the target project
     pub packages: Vec<String>,
+    /// Packages to exclude from testing
+    pub exclude: Vec<String>,
     /// Varargs to be forwarded to the test executables.
     pub varargs: Vec<String>,
 }
@@ -114,6 +116,10 @@ impl Config {
             Some(v) => v,
             None => vec![],
         };
+        let exclude: Vec<String> = match args.values_of_lossy("exclude") {
+            Some(v) => v,
+            None => vec![],
+        };
         let varargs: Vec<String> = match args.values_of_lossy("args") {
             Some(v) => v,
             None => vec![],
@@ -133,6 +139,7 @@ impl Config {
             forward_signals: forward,
             features: features,
             packages: packages,
+            exclude: exclude,
             varargs: varargs
         }
     }

src/lib.rs

@@ -68,15 +68,22 @@ pub fn launch_tarpaulin(config: &Config) -> Result<Vec<TracerData>, i32> {
                                    flag_quiet,
                                    &None,
                                    false,
-                                   false);
+                                   false,
+                                   &[]);
 
     let workspace = Workspace::new(config.manifest.as_path(), &cargo_config).map_err(|_| 1i32)?;
 
     setup_environment(&cargo_config);
 
     let mut copt = ops::CompileOptions::default(&cargo_config, ops::CompileMode::Test); 
     copt.features = config.features.as_slice();
-    copt.spec = ops::Packages::Packages(config.packages.as_slice());
+    copt.spec = match ops::Packages::from_flags(workspace.is_virtual(), true, &config.exclude, &config.packages) {
+        Ok(spec) => spec,
+        Err(e) => { 
+            println!("Error getting Packages from workspace {}", e);
+            return Err(-1)
+        }
+    };
     if config.verbose {
         println!("Running Tarpaulin");
     }
@@ -450,6 +457,10 @@ fn execute_test(test: &Path, ignored: bool, config: &Config) {
         Err(e) => println!("ASLR disable failed: {}", e),
     }
     request_trace().expect("Failed to trace");
+    println!("running {}", test.display());
+    if let Some(parent) = config.manifest.parent() {
+        let _ = env::set_current_dir(parent);
+    }
 
     let mut envars: Vec<CString> = vec![CString::new("RUST_TEST_THREADS=1").unwrap()];
     for (key, value) in env::vars() {