summaryrefslogtreecommitdiffstats
path: root/scripts
diff options
context:
space:
mode:
authorBrian Behlendorf <[email protected]>2010-11-11 10:17:02 -0800
committerBrian Behlendorf <[email protected]>2010-11-11 11:40:06 -0800
commit7dc3830c0f591ae8dfe349cf67c0c61cc8602dc8 (patch)
treee4bd6a045a68f10457544f5712609e8041295f06 /scripts
parentcf47fad67d798f42e6d2edc8b0e9f9b43175703b (diff)
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.
Diffstat (limited to 'scripts')
-rw-r--r--scripts/Makefile.am1
-rw-r--r--scripts/Makefile.in1
-rwxr-xr-xscripts/zconfig.sh1
-rwxr-xr-xscripts/zfault.sh1
4 files changed, 4 insertions, 0 deletions
diff --git a/scripts/Makefile.am b/scripts/Makefile.am
index cc910bab5..3dc1e67fb 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 8c6e67d54..3e68eda65 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 674ec57fd..31c3011c7 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 08d822538..7f7740424 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.*