tests: rely on require_scsi_debug_module_ to modprobe scsi_debug module

* t2310-dos-extended-2-sector-min-offset.sh: remove explicit modprobe
since it is done by require_scsi_debug_module_.
* t3200-type-change.sh: likewise.
* t9020-alignment.sh: likewise.
* t9030-align-check.sh: likewise.
* t9040-many-partitions.sh: likewise.

diff --git a/tests/t2310-dos-extended-2-sector-min-offset.sh b/tests/t2310-dos-extended-2-sector-min-offset.sh
index 6d4b23c..399d0ef 100644 (file)
--- a/tests/t2310-dos-extended-2-sector-min-offset.sh
+++ b/tests/t2310-dos-extended-2-sector-min-offset.sh
@@ -30,10 +30,6 @@ fi
 require_root_
 require_scsi_debug_module_
 
-# check for scsi_debug module
-modprobe -n scsi_debug ||
-  skip_test_ "you lack the scsi_debug kernel module"
-
 # create memory-backed device
 scsi_debug_setup_ dev_size_mb=1 > dev-name ||
   skip_test_ 'failed to create scsi_debug device'

diff --git a/tests/t3200-type-change.sh b/tests/t3200-type-change.sh
index e64e6c7..0a92426 100755 (executable)
--- a/tests/t3200-type-change.sh
+++ b/tests/t3200-type-change.sh
@@ -27,10 +27,6 @@ fi
 require_root_
 require_scsi_debug_module_
 
-# check for scsi_debug module
-modprobe -n scsi_debug ||
-  skip_test_ "you lack the scsi_debug kernel module"
-
 grep '^#define USE_BLKID 1' "$CONFIG_HEADER" > /dev/null ||
   skip_test_ 'this system lacks a new-enough libblkid'
 

diff --git a/tests/t9020-alignment.sh b/tests/t9020-alignment.sh
index b43acbc..88ac231 100755 (executable)
--- a/tests/t9020-alignment.sh
+++ b/tests/t9020-alignment.sh
@@ -27,10 +27,6 @@ fi
 require_root_
 require_scsi_debug_module_
 
-# check for scsi_debug module
-modprobe -n scsi_debug ||
-  skip_test_ "you lack the scsi_debug kernel module"
-
 grep '^#define USE_BLKID 1' "$CONFIG_HEADER" > /dev/null ||
   skip_test_ 'this system lacks a new-enough libblkid'
 

diff --git a/tests/t9030-align-check.sh b/tests/t9030-align-check.sh
index 76b359a..1839bf9 100644 (file)
--- a/tests/t9030-align-check.sh
+++ b/tests/t9030-align-check.sh
@@ -27,10 +27,6 @@ fi
 require_root_
 require_scsi_debug_module_
 
-# check for scsi_debug module
-modprobe -n scsi_debug ||
-  skip_test_ "you lack the scsi_debug kernel module"
-
 grep '^#define USE_BLKID 1' "$CONFIG_HEADER" > /dev/null ||
   skip_test_ 'this system lacks a new-enough libblkid'
 

diff --git a/tests/t9040-many-partitions.sh b/tests/t9040-many-partitions.sh
index 4c0b7ea..c094c02 100644 (file)
--- a/tests/t9040-many-partitions.sh
+++ b/tests/t9040-many-partitions.sh
@@ -27,10 +27,6 @@ fi
 require_root_
 require_scsi_debug_module_
 
-# check for scsi_debug module
-modprobe -n scsi_debug ||
-  skip_test_ "you lack the scsi_debug kernel module"
-
 grep '^#define USE_BLKID 1' "$CONFIG_HEADER" > /dev/null ||
   skip_test_ 'this system lacks a new-enough libblkid'