summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTim Oram <dev@mitmaro.ca>2021-07-01 21:25:15 -0230
committerTim Oram <dev@mitmaro.ca>2021-07-05 16:27:53 -0230
commitea31e8e2919408fc8e4123cc63cc5aa18269b60c (patch)
tree08d7b4d1fdc32a3aa12a8d0b7e255f1281097b51
parentb63a6d123ea4509e2ac62f8f099f71225f4c8453 (diff)
Add coverage ignore attributes
Ignore some code from coverage reports that cannot or should not be included.
-rwxr-xr-xscripts/coverage.bash4
-rwxr-xr-xscripts/test.bash2
-rw-r--r--src/config/src/lib.rs1
-rw-r--r--src/display/src/lib.rs2
-rw-r--r--src/input/src/lib.rs1
-rw-r--r--src/main.rs1
-rw-r--r--src/view/src/lib.rs1
7 files changed, 9 insertions, 3 deletions
diff --git a/scripts/coverage.bash b/scripts/coverage.bash
index 83d1732..839475c 100755
--- a/scripts/coverage.bash
+++ b/scripts/coverage.bash
@@ -5,5 +5,5 @@ set -u
set -o pipefail
rustup update nightly
-cargo +nightly install --version 0.16.0 cargo-tarpaulin
-cargo +nightly tarpaulin --exclude-files=src/display/crossterm.rs --workspace --all-features --ignore-tests --line --verbose --out Html --out Lcov --output-dir coverage "$@"
+cargo +nightly install cargo-tarpaulin
+cargo +nightly tarpaulin --workspace --all-features --ignore-tests --line --verbose --out Html --out Lcov --output-dir coverage "$@"
diff --git a/scripts/test.bash b/scripts/test.bash
index 929d0bd..2d7a449 100755
--- a/scripts/test.bash
+++ b/scripts/test.bash
@@ -5,4 +5,4 @@ set -u
set -o pipefail
rustup update stable
-cargo test --workspace
+cargo +stable test --workspace
diff --git a/src/config/src/lib.rs b/src/config/src/lib.rs
index 819ff9f..39de9cc 100644
--- a/src/config/src/lib.rs
+++ b/src/config/src/lib.rs
@@ -91,6 +91,7 @@ mod diff_ignore_whitespace_setting;
mod diff_show_whitespace_setting;
mod git_config;
mod key_bindings;
+#[cfg(not(tarpaulin_include))]
pub mod testutil;
mod theme;
mod utils;
diff --git a/src/display/src/lib.rs b/src/display/src/lib.rs
index 6577375..2409ce3 100644
--- a/src/display/src/lib.rs
+++ b/src/display/src/lib.rs
@@ -105,9 +105,11 @@
//! performance should only be used in test code.
mod color_mode;
+#[cfg(not(tarpaulin_include))]
mod crossterm;
mod display_color;
mod size;
+#[cfg(not(tarpaulin_include))]
pub mod testutil;
mod tui;
mod utils;
diff --git a/src/input/src/lib.rs b/src/input/src/lib.rs
index 1926692..08998e7 100644
--- a/src/input/src/lib.rs
+++ b/src/input/src/lib.rs
@@ -86,6 +86,7 @@ mod event_handler;
mod input_options;
mod key_bindings;
mod meta_event;
+#[cfg(not(tarpaulin_include))]
pub mod testutil;
pub use crossterm::event::{KeyCode, KeyEvent, KeyModifiers, MouseEvent, MouseEventKind};
diff --git a/src/main.rs b/src/main.rs
index 93468ba..f7188d3 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -51,6 +51,7 @@ use std::env::args_os;
// TODO use the termination trait once rust-lang/rust#43301 is stable
#[allow(clippy::exit, clippy::print_stderr)]
+#[cfg(not(tarpaulin_include))]
fn main() {
let exit = core::run(args_os().skip(1).collect());
if let Some(message) = exit.get_message().as_ref() {
diff --git a/src/view/src/lib.rs b/src/view/src/lib.rs
index 362d8b3..9699dd6 100644
--- a/src/view/src/lib.rs
+++ b/src/view/src/lib.rs
@@ -97,6 +97,7 @@ mod render_context;
mod render_slice;
mod scroll_position;
mod sender;
+#[cfg(not(tarpaulin_include))]
pub mod testutil;
mod thread;
mod util;