[PATCH blktests] check: add command line switch to test device drivers only

[PATCH blktests] check: add command line switch to test device drivers only

[Johannes Thumshirn]

Sometimes it's useful to only run tests which exercise a device
special driver to verify a patch for the driver doesn't introduce a
regression.

Running the whole test-suite is just a waste of time in this case, so
provide a way to only run tests which have a test_device() function
set and not a test() function.

Signed-off-by: Johannes Thumshirn <jthumshirn@suse.de>
---
 check | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/check b/check
index 4baa8dde2436..639fcc43f09d 100755
--- a/check
+++ b/check
@@ -395,6 +395,12 @@ _run_test() {
 	. "tests/${TEST_NAME}"
 
 	if declare -fF test >/dev/null; then
+		if [[ -v DEVICE_ONLY ]]; then
+			SKIP_REASON="test excluded by user"
+			_output_notrun "$TEST_NAME"
+			return 0
+		fi
+
 		if declare -fF requires >/dev/null && ! requires; then
 			_output_notrun "$TEST_NAME"
 			return 0
@@ -546,6 +552,9 @@ Test runs:
   -x, --exclude=TEST     exclude a test (or test group) from the list of
 			 tests to run
 
+  -d --device-only       only run test which use a test device from the
+                         TEST_DEV config setting
+
 Miscellaneous:
   -h, --help             display this help message and exit"
 
@@ -570,6 +579,7 @@ unset TEMP
 
 # Default configuration.
 QUICK_RUN=0
+DEVICE_ONLY=0
 EXCLUDE=()
 TEST_DEVS=()
 
@@ -592,6 +602,10 @@ while true; do
 			EXCLUDE+=("$2")
 			shift 2
 			;;
+		'-d'|'--device-only')
+			DEVICE_ONLY=1
+			shift 2
+			;;
 		'-h'|'--help')
 			usage out
 			;;
@@ -609,6 +623,10 @@ if [[ QUICK_RUN -ne 0 && ! -v TIMEOUT ]]; then
 	_error "QUICK_RUN specified without TIMEOUT"
 fi
 
+if [[ DEVICE_ONLY -ne 0 && ${#TEST_DEVS[@]} -eq 0 ]]; then
+	_error "DEVICE_ONLY specified without TEST_DEVS"
+fi
+
 # Convert the exclude list to an associative array.
 TEMP_EXCLUDE=("${EXCLUDE[@]}")
 unset EXCLUDE
-- 
2.16.4

Re: [PATCH blktests] check: add command line switch to test device drivers only

[Johannes Thumshirn]

Ping?
-- 
Johannes Thumshirn                                          Storage
jthumshirn@suse.de                                +49 911 74053 689
SUSE LINUX GmbH, Maxfeldstr. 5, 90409 N�rnberg
GF: Felix Imend�rffer, Jane Smithard, Graham Norton
HRB 21284 (AG N�rnberg)
Key fingerprint = EC38 9CAB C2C4 F25D 8600 D0D0 0393 969D 2D76 0850

Re: [PATCH blktests] check: add command line switch to test device drivers only

[Omar Sandoval]

On Tue, Jun 12, 2018 at 11:57:06AM +0200, Johannes Thumshirn wrote:
> Sometimes it's useful to only run tests which exercise a device
> special driver to verify a patch for the driver doesn't introduce a
> regression.
> 
> Running the whole test-suite is just a waste of time in this case, so
> provide a way to only run tests which have a test_device() function
> set and not a test() function.

Thanks, applied with a few fixes mentioned below.

> Signed-off-by: Johannes Thumshirn <jthumshirn@suse.de>
> ---
>  check | 18 ++++++++++++++++++
>  1 file changed, 18 insertions(+)
> 
> diff --git a/check b/check
> index 4baa8dde2436..639fcc43f09d 100755
> --- a/check
> +++ b/check
> @@ -395,6 +395,12 @@ _run_test() {
>  	. "tests/${TEST_NAME}"
>  
>  	if declare -fF test >/dev/null; then
> +		if [[ -v DEVICE_ONLY ]]; then
> +			SKIP_REASON="test excluded by user"
> +			_output_notrun "$TEST_NAME"
> +			return 0
> +		fi
> +

This should go in _found_test() where we do the -q skipping, too.

>  		if declare -fF requires >/dev/null && ! requires; then
>  			_output_notrun "$TEST_NAME"
>  			return 0
> @@ -546,6 +552,9 @@ Test runs:
>    -x, --exclude=TEST     exclude a test (or test group) from the list of
>  			 tests to run
>  
> +  -d --device-only       only run test which use a test device from the
> +                         TEST_DEV config setting
> +
>  Miscellaneous:
>    -h, --help             display this help message and exit"
>  
> @@ -570,6 +579,7 @@ unset TEMP
>  
>  # Default configuration.
>  QUICK_RUN=0
> +DEVICE_ONLY=0
>  EXCLUDE=()
>  TEST_DEVS=()
>  
> @@ -592,6 +602,10 @@ while true; do
>  			EXCLUDE+=("$2")
>  			shift 2
>  			;;
> +		'-d'|'--device-only')
> +			DEVICE_ONLY=1
> +			shift 2

This doesn't take an argument, so it's just shift, not shift 2.

> +			;;

This needs a matching "d" added to the getopt call.

>  		'-h'|'--help')
>  			usage out
>  			;;
> @@ -609,6 +623,10 @@ if [[ QUICK_RUN -ne 0 && ! -v TIMEOUT ]]; then
>  	_error "QUICK_RUN specified without TIMEOUT"
>  fi
>  
> +if [[ DEVICE_ONLY -ne 0 && ${#TEST_DEVS[@]} -eq 0 ]]; then

This should be $DEVICE_ONLY. Looks like I made the same mistake above
with $QUICK_RUN ;)

> +	_error "DEVICE_ONLY specified without TEST_DEVS"
> +fi
> +
>  # Convert the exclude list to an associative array.
>  TEMP_EXCLUDE=("${EXCLUDE[@]}")
>  unset EXCLUDE
> -- 
> 2.16.4
> 

Re: [PATCH blktests] check: add command line switch to test device drivers only

[Johannes Thumshirn]

Thanks :-)
-- 
Johannes Thumshirn                                          Storage
jthumshirn@suse.de                                +49 911 74053 689
SUSE LINUX GmbH, Maxfeldstr. 5, 90409 N�rnberg
GF: Felix Imend�rffer, Jane Smithard, Graham Norton
HRB 21284 (AG N�rnberg)
Key fingerprint = EC38 9CAB C2C4 F25D 8600 D0D0 0393 969D 2D76 0850