Skip to content

Commit 75c9093

Browse files
committed
In Makefile use features variables throughout
There is no need to use the feature argument literals. Signed-off-by: mulhern <amulhern@redhat.com>
1 parent 341e5be commit 75c9093

1 file changed

Lines changed: 6 additions & 6 deletions

File tree

Makefile

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -421,27 +421,27 @@ test-clevis-loop-should-fail-valgrind:
421421

422422
## Test stratisd-min CLI as root
423423
test-stratisd-min-root:
424-
RUSTFLAGS="${RUSTFLAGS}" RUST_BACKTRACE=1 RUST_TEST_THREADS=1 cargo test --no-default-features --features "engine,min" test_stratisd_min
424+
RUSTFLAGS="${RUSTFLAGS}" RUST_BACKTRACE=1 RUST_TEST_THREADS=1 cargo test ${MIN_FEATURES} test_stratisd_min
425425

426426
## Test stratisd-min CLI
427427
test-stratisd-min:
428-
RUSTFLAGS="${RUSTFLAGS}" RUST_BACKTRACE=1 RUST_TEST_THREADS=1 CARGO_TARGET_X86_64_UNKNOWN_LINUX_GNU_RUNNER='sudo -E' cargo test --no-default-features --features "engine,min" test_stratisd_min
428+
RUSTFLAGS="${RUSTFLAGS}" RUST_BACKTRACE=1 RUST_TEST_THREADS=1 CARGO_TARGET_X86_64_UNKNOWN_LINUX_GNU_RUNNER='sudo -E' cargo test ${MIN_FEATURES} test_stratisd_min
429429

430430
## Test stratis-min CLI
431431
test-stratis-min-root:
432-
RUSTFLAGS="${RUSTFLAGS}" RUST_BACKTRACE=1 RUST_TEST_THREADS=1 cargo test --no-default-features --features "engine,min" test_stratis_min
432+
RUSTFLAGS="${RUSTFLAGS}" RUST_BACKTRACE=1 RUST_TEST_THREADS=1 cargo test ${MIN_FEATURES} test_stratis_min
433433

434434
## Test stratis-min CLI
435435
test-stratis-min:
436-
RUSTFLAGS="${RUSTFLAGS}" RUST_BACKTRACE=1 RUST_TEST_THREADS=1 CARGO_TARGET_X86_64_UNKNOWN_LINUX_GNU_RUNNER='sudo -E' cargo test --no-default-features --features "engine,min" test_stratis_min
436+
RUSTFLAGS="${RUSTFLAGS}" RUST_BACKTRACE=1 RUST_TEST_THREADS=1 CARGO_TARGET_X86_64_UNKNOWN_LINUX_GNU_RUNNER='sudo -E' cargo test ${MIN_FEATURES} test_stratis_min
437437

438438
## Test stratisd-tools CLI
439439
test-stratisd-tools:
440-
RUSTFLAGS="${RUSTFLAGS}" RUST_BACKTRACE=1 RUST_TEST_THREADS=1 cargo test --no-default-features --features "engine,extras" test_stratisd_tools
440+
RUSTFLAGS="${RUSTFLAGS}" RUST_BACKTRACE=1 RUST_TEST_THREADS=1 cargo test ${EXTRAS_FEATURES} test_stratisd_tools
441441

442442
## Test stratis-utils
443443
test-stratis-utils:
444-
RUSTFLAGS="${RUSTFLAGS}" RUST_BACKTRACE=1 RUST_TEST_THREADS=1 cargo test --no-default-features --features "dbus_enabled,engine" test_stratis_utils
444+
RUSTFLAGS="${RUSTFLAGS}" RUST_BACKTRACE=1 RUST_TEST_THREADS=1 cargo test ${UTILS_FEATURES} test_stratis_utils
445445

446446
## Run yamllint on workflow files
447447
yamllint:

0 commit comments

Comments
 (0)