From 7dbd7f21d5167952085aea0222522f7a809e111c Mon Sep 17 00:00:00 2001 From: Su Yue Date: Thu, 28 Sep 2017 15:29:19 +0800 Subject: btrfs-progs: tests: arg override in command line Lowmem mode only repairs few cases which has a beacon file ".lowmem_repairable" in the case' directory. However, defining TEST_ENABLE_OVERRIDE=true in command line does work in above strategy. Because _skip_spec() in tests/common.local isn't interpreted by shell in that case. Solve it by making _skip_spec() always be defined in common.local. Reported-by: David Sterba Signed-off-by: Su Yue [ keep the _skip_spec check ] Signed-off-by: David Sterba --- tests/common.local | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/tests/common.local b/tests/common.local index 4f56bb08..d2b8d073 100644 --- a/tests/common.local +++ b/tests/common.local @@ -3,14 +3,13 @@ # additional arguments to various commands # already defined, eg. via make argument -if [ -n "$TEST_ENABLE_OVERRIDE" ]; then - return -fi +if [ -z "$TEST_ENABLE_OVERRIDE" ]; then + # set to 'true' + TEST_ENABLE_OVERRIDE=false -# set to 'true' -TEST_ENABLE_OVERRIDE=false + TEST_ARGS_CHECK=--mode=lowmem +fi -TEST_ARGS_CHECK=--mode=lowmem # gets arguments of a current command and can decide if the argument insertion # should happen, eg. if some option combination does not make sense or would -- cgit v1.2.3