diff options
| -rw-r--r-- | lib/libktest.sh | 2 | ||||
| -rwxr-xr-x | lib/testrunner | 4 | ||||
| -rw-r--r-- | tests/kconfig.sh | 5 | ||||
| -rw-r--r-- | tests/prelude.sh | 2 | ||||
| -rw-r--r-- | tests/xfstests.sh | 37 |
5 files changed, 26 insertions, 24 deletions
diff --git a/lib/libktest.sh b/lib/libktest.sh index 13e086e..72acdbc 100644 --- a/lib/libktest.sh +++ b/lib/libktest.sh @@ -27,8 +27,6 @@ ktest_networking=user ktest_dio=off ktest_nice=0 -ktest_storage_bus=virtio-scsi-pci - checkdep socat checkdep qemu-system-x86_64 qemu-system-x86 checkdep brotli diff --git a/lib/testrunner b/lib/testrunner index 5cd497a..bebadfa 100755 --- a/lib/testrunner +++ b/lib/testrunner @@ -145,10 +145,6 @@ do_reboot() echo b > /proc/sysrq-trigger } -for h in $(declare -F|sed -ne '/ hook_/ s/.*hook_// p'); do - run_quiet "running test hook $h" hook_$h -done - echo -n "Kernel version: " uname -r diff --git a/tests/kconfig.sh b/tests/kconfig.sh index caf1294..1719eea 100644 --- a/tests/kconfig.sh +++ b/tests/kconfig.sh @@ -115,6 +115,11 @@ case $ktest_storage_bus in ;; lsi) require-kernel-config SCSI_MPT3SAS + ;; + *) + echo "No storage bus selected" + exit 1 + ;; esac # PCI: diff --git a/tests/prelude.sh b/tests/prelude.sh index b8662ec..f6fd234 100644 --- a/tests/prelude.sh +++ b/tests/prelude.sh @@ -10,6 +10,7 @@ if [[ ! -v ktest_verbose ]]; then ktest_mem="" ktest_timeout="" ktest_kernel_append=() + ktest_storage_bus=virtio-scsi-pci ktest_images=() ktest_scratch_devs=() ktest_make_install=() @@ -250,6 +251,7 @@ main() echo "ktest_mem=$ktest_mem" echo "ktest_timeout=$ktest_timeout" echo "ktest_kernel_append=(${ktest_kernel_append[@]})" + echo "ktest_storage_bus=$ktest_storage_bus" echo "ktest_images=(${ktest_images[@]})" echo "ktest_scratch_devs=(${ktest_scratch_devs[@]})" echo "ktest_make_install=(${ktest_make_install[@]})" diff --git a/tests/xfstests.sh b/tests/xfstests.sh index e33f91c..171629f 100644 --- a/tests/xfstests.sh +++ b/tests/xfstests.sh @@ -26,24 +26,30 @@ list_tests() (cd $(dirname $(readlink -e "${BASH_SOURCE[0]}"))/xfstests/tests; echo generic/???) } -hook_xfstests() +run_xfstests() { - mkswap /dev/sde - swapon /dev/sde + export FSTYP="$1" + shift - useradd -m fsgqa - useradd fsgqa2 - useradd 123456-fsgqa + if [[ ! -f /xfstests-init-done ]]; then + mkswap /dev/sde + swapon /dev/sde - mkdir -p /mnt/test /mnt/scratch + useradd -m fsgqa + useradd fsgqa2 + useradd 123456-fsgqa - run_quiet "building $(basename $i)" make -j $ktest_cpus -C "$ktest_dir/tests/xfstests" -} + mkdir -p /mnt/test /mnt/scratch -run_xfstests() -{ - export FSTYP="$1" - shift + run_quiet "building $(basename $i)" make -j $ktest_cpus -C "$ktest_dir/tests/xfstests" + + rm -rf /ktest-out/xfstests + + wipefs -af /dev/sdb + mkfs.$FSTYP $MKFS_OPTIONS -q /dev/sdb + + touch /xfstests-init-done + fi cat << EOF > /ktest/tests/xfstests/local.config TEST_DEV=/dev/sdb @@ -56,11 +62,6 @@ LOGGER_PROG=true EOF export MKFS_OPTIONS - - rm -rf /ktest-out/xfstests - - wipefs -af /dev/sdb - mkfs.$FSTYP $MKFS_OPTIONS -q /dev/sdb mount -t $FSTYP /dev/sdb /mnt/test cd "$ktest_dir/tests/xfstests" |