Merge branch 'develop'

CHANGELOG.md

@@ -3,10 +3,11 @@
 From 2019 onwards, all notable changes to tarpaulin will be documented in this
 file.
 
-## [Unreleased]
+## [0.18.2] 2021-09-05
 ### Added
 
 ### Changed
+- Fix #819 incorrect handling of test args caused by removing the executable path as first program arg in execve
 
 ### Removed
 

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "cargo-tarpaulin"
-version = "0.18.1"
+version = "0.18.2"
 authors = ["Daniel McKenna <[email protected]>"]
 description = "Cargo-Tarpaulin is a tool to determine code coverage achieved via tests"
 repository = "https://github.com/xd009642/tarpaulin"

README.md

@@ -27,7 +27,7 @@ Below is the help-text for a thorough explanation of the flags and features
 available:
 
 ```
-cargo-tarpaulin version: 0.18.0
+cargo-tarpaulin version: 0.18.2
 Tool to analyse test coverage of cargo projects
 
 USAGE:

src/process_handling/mod.rs

@@ -213,7 +213,10 @@ fn execute_test(test: &TestBinary, ignored: bool, config: &Config) -> Result<Tes
             Ok(hnd.into())
         }
         #[cfg(target_os = "linux")]
-        TraceEngine::Ptrace => execute(test.path(), &argv, envars.as_slice()),
+        TraceEngine::Ptrace => {
+            argv.insert(0, test.path().display().to_string());
+            execute(test.path(), &argv, envars.as_slice())
+        }
         e => Err(RunError::Engine(format!(
             "invalid execution engine {:?}",
             e

tests/line_coverage.rs

@@ -67,3 +67,31 @@ fn debug_info_0() {
     assert!(!res.is_empty());
     env::set_current_dir(restore_dir).unwrap();
 }
+
+#[test]
+fn test_threads_1() {
+    let mut config = Config::default();
+    config.force_clean = false;
+    let restore_dir = env::current_dir().unwrap();
+    let test_dir = get_test_path("simple_project");
+    env::set_current_dir(&test_dir).unwrap();
+    config.manifest = test_dir.clone();
+    config.manifest.push("Cargo.toml");
+    config.varargs.push("--test-threads".to_string());
+    config.varargs.push("1".to_string());
+
+    let (res, ret) = launch_tarpaulin(&config, &None).unwrap();
+    assert_eq!(ret, 0);
+    assert!(!res.is_empty());
+    env::set_current_dir(restore_dir).unwrap();
+
+    let lib_file = test_dir.join("src/lib.rs");
+    let lib_traces = res.get_child_traces(&lib_file);
+    for l in &lib_traces {
+        if l.line == 6 {
+            assert_eq!(CoverageStat::Line(0), l.stats);
+        } else if l.line == 8 {
+            assert_eq!(CoverageStat::Line(1), l.stats);
+        }
+    }
+}

travis-install.sh

@@ -1,2 +1,2 @@
 #!/bin/bash
-curl -sL https://github.com/xd009642/tarpaulin/releases/download/0.18.1/cargo-tarpaulin-0.18.1-travis.tar.gz | tar xvz -C $HOME/.cargo/bin
+curl -sL https://github.com/xd009642/tarpaulin/releases/download/0.18.2/cargo-tarpaulin-0.18.2-travis.tar.gz | tar xvz -C $HOME/.cargo/bin