From 8041a1c2295178251aa75cec083b11691f3f14cd Mon Sep 17 00:00:00 2001 From: David Sterba Date: Tue, 5 Nov 2019 20:14:56 +0100 Subject: [PATCH] btrfs-progs: tests: enhance convert option injection Add support for TEST_ARGS_CONVERT to allow injection of eg. checksum command for the all tests. Use like $ make TEST_ARGS_CONVERT='--csum=xxhash' TEST_ENABLE_OVERRIDE=true test-convert This affects all btrfs-convert commands that are run by run_check and other helpers, IOW this affects all tests, not just convert specific ones. Signed-off-by: David Sterba --- tests/README.md | 3 +++ tests/common | 10 ++++++++++ 2 files changed, 13 insertions(+) diff --git a/tests/README.md b/tests/README.md index 334969fe..b166e488 100644 --- a/tests/README.md +++ b/tests/README.md @@ -129,6 +129,9 @@ the root helper). * `TEST_ARGS_MKFS` -- user-defined arguments to `mkfs.btrfs`, before the test-specific arguments +* `TEST_ARGS_CONVERT` -- user-defined arguments to `btrfs-convert`, before the + test-specific arguments + Multiple values can be separated by `,`. ### Permissions diff --git a/tests/common b/tests/common index b88e7c51..e3f50fe6 100644 --- a/tests/common +++ b/tests/common @@ -95,6 +95,10 @@ _get_spec_ins() echo -n 3 return fi + if [[ $2 =~ /btrfs-convert$ ]]; then + echo -n 3 + return + fi else if [[ $1 =~ /btrfs$ ]]; then echo -n 3 @@ -104,6 +108,10 @@ _get_spec_ins() echo -n 2 return fi + if [[ $1 =~ /btrfs-convert$ ]]; then + echo -n 2 + return + fi fi echo -n 2 } @@ -122,6 +130,7 @@ _cmd_spec() case "$1" in check) echo -n "$TEST_ARGS_CHECK" ;; */mkfs.btrfs) echo -n "$TEST_ARGS_MKFS" ;; + */btrfs-convert) echo -n "$TEST_ARGS_CONVERT" ;; esac fi } @@ -723,6 +732,7 @@ init_env() echo "INCLUDE common.local" >> "$RESULTS" echo " check: $TEST_ARGS_CHECK" >> "$RESULTS" echo " mkfs: $TEST_ARGS_MKFS" >> "$RESULTS" + echo " convert: $TEST_ARGS_CONVERT" >> "$RESULTS" fi } init_env