From 3c01526869ab5811fef2ff2180da30cd2c6dc3eb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9s=20N=2E=20Robalino?= Date: Tue, 21 Jan 2020 22:00:27 -0500 Subject: [PATCH] Test binaries no longer belong to stable or default features. (#1259) --- .azure/azure-pipelines.yml | 6 +++--- Cargo.toml | 18 +++++++++--------- .../src/{dummies => bins}/chop.rs | 0 .../src/{dummies => bins}/cococo.rs | 0 .../src/{dummies => bins}/fail.rs | 0 5 files changed, 12 insertions(+), 12 deletions(-) rename crates/nu-test-support/src/{dummies => bins}/chop.rs (100%) rename crates/nu-test-support/src/{dummies => bins}/cococo.rs (100%) rename crates/nu-test-support/src/{dummies => bins}/fail.rs (100%) diff --git a/.azure/azure-pipelines.yml b/.azure/azure-pipelines.yml index 50d9b3e1a..469dc20fc 100644 --- a/.azure/azure-pipelines.yml +++ b/.azure/azure-pipelines.yml @@ -44,13 +44,13 @@ steps: echo "##vso[task.prependpath]$HOME/.cargo/bin" rustup component add rustfmt displayName: Install Rust - - bash: RUSTFLAGS="-D warnings" cargo test --all --features=stable + - bash: RUSTFLAGS="-D warnings" cargo test --all --features stable,test-bins condition: eq(variables['style'], 'unflagged') displayName: Run tests - bash: RUSTFLAGS="-D warnings" cargo clippy --all --features=stable -- -D clippy::result_unwrap_used -D clippy::option_unwrap_used condition: eq(variables['style'], 'unflagged') displayName: Check clippy lints - - bash: NUSHELL_ENABLE_ALL_FLAGS=1 RUSTFLAGS="-D warnings" cargo test --all --features=stable + - bash: NUSHELL_ENABLE_ALL_FLAGS=1 RUSTFLAGS="-D warnings" cargo test --all --features stable,test-bins condition: eq(variables['style'], 'canary') displayName: Run tests - bash: NUSHELL_ENABLE_ALL_FLAGS=1 RUSTFLAGS="-D warnings" cargo clippy --all --features=stable -- -D clippy::result_unwrap_used -D clippy::option_unwrap_used @@ -59,4 +59,4 @@ steps: - bash: cargo fmt --all -- --check condition: eq(variables['style'], 'fmt') displayName: Lint - \ No newline at end of file + diff --git a/Cargo.toml b/Cargo.toml index 2417ecf88..c8c54dbb2 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -139,10 +139,10 @@ semver = {version = "0.9.0", optional = true} users = "0.9" [features] -# Dummy executables -nu-dummies = [] +# Test executables +test-bins = [] -default = ["nu-dummies", "sys", "ps", "textview", "inc", "str"] +default = ["sys", "ps", "textview", "inc", "str"] stable = ["default", "starship-prompt", "binaryview", "match", "tree", "average", "sum", "post", "fetch", "clipboard"] # Default @@ -183,18 +183,18 @@ path = "src/lib.rs" [[bin]] name = "fail" -path = "crates/nu-test-support/src/dummies/fail.rs" -required-features = ["nu-dummies"] +path = "crates/nu-test-support/src/bins/fail.rs" +required-features = ["test-bins"] [[bin]] name = "chop" -path = "crates/nu-test-support/src/dummies/chop.rs" -required-features = ["nu-dummies"] +path = "crates/nu-test-support/src/bins/chop.rs" +required-features = ["test-bins"] [[bin]] name = "cococo" -path = "crates/nu-test-support/src/dummies/cococo.rs" -required-features = ["nu-dummies"] +path = "crates/nu-test-support/src/bins/cococo.rs" +required-features = ["test-bins"] # Core plugins that ship with `cargo install nu` by default # Currently, Cargo limits us to installing only one binary diff --git a/crates/nu-test-support/src/dummies/chop.rs b/crates/nu-test-support/src/bins/chop.rs similarity index 100% rename from crates/nu-test-support/src/dummies/chop.rs rename to crates/nu-test-support/src/bins/chop.rs diff --git a/crates/nu-test-support/src/dummies/cococo.rs b/crates/nu-test-support/src/bins/cococo.rs similarity index 100% rename from crates/nu-test-support/src/dummies/cococo.rs rename to crates/nu-test-support/src/bins/cococo.rs diff --git a/crates/nu-test-support/src/dummies/fail.rs b/crates/nu-test-support/src/bins/fail.rs similarity index 100% rename from crates/nu-test-support/src/dummies/fail.rs rename to crates/nu-test-support/src/bins/fail.rs