From 7dc3830c0f591ae8dfe349cf67c0c61cc8602dc8 Mon Sep 17 00:00:00 2001 From: Brian Behlendorf Date: Thu, 11 Nov 2010 10:17:02 -0800 Subject: [PATCH] Remove spl/zfs modules as part of cleanup The idea behind the '-c' flag is to cleanup everything from a previous test run which might cause the test script to fail. This should also include removing the previously loaded module. This makes it a little easier to run 'zconfig.sh -c', however remember this is a test script and it will take all of your other zpools offline for the purposes of the test. This notion has also been extended to the default 'make check' behavior. --- scripts/Makefile.am | 1 + scripts/Makefile.in | 1 + scripts/zconfig.sh | 1 + scripts/zfault.sh | 1 + 4 files changed, 4 insertions(+) diff --git a/scripts/Makefile.am b/scripts/Makefile.am index cc910ba..3dc1e67 100644 --- a/scripts/Makefile.am +++ b/scripts/Makefile.am @@ -36,6 +36,7 @@ clean: done check: + @$(ZFS) -u @echo @echo -n "====================================" @echo -n " ZTEST " diff --git a/scripts/Makefile.in b/scripts/Makefile.in index 8c6e67d..3e68eda 100644 --- a/scripts/Makefile.in +++ b/scripts/Makefile.in @@ -732,6 +732,7 @@ clean: done check: + @$(ZFS) -u @echo @echo -n "====================================" @echo -n " ZTEST " diff --git a/scripts/zconfig.sh b/scripts/zconfig.sh index 674ec57..31c3011 100755 --- a/scripts/zconfig.sh +++ b/scripts/zconfig.sh @@ -60,6 +60,7 @@ fi # Perform pre-cleanup is requested if [ ${CLEANUP} ]; then + ${ZFS_SH} -u cleanup_md_devices cleanup_loop_devices rm -f /tmp/zpool.cache.* diff --git a/scripts/zfault.sh b/scripts/zfault.sh index 08d8225..7f77404 100755 --- a/scripts/zfault.sh +++ b/scripts/zfault.sh @@ -88,6 +88,7 @@ fi # Perform pre-cleanup is requested if [ ${CLEANUP} ]; then + ${ZFS_SH} -u cleanup_md_devices cleanup_loop_devices rm -f /tmp/zpool.cache.* -- 1.8.3.1