mdadm/test: add do_clean to ensure each case only catch its own testlog

Signed-off-by: Zhilong Liu <zlliu@suse.com>
Signed-off-by: Jes Sorensen <jsorensen@fb.com>

diff --git a/clustermd_tests/func.sh b/clustermd_tests/func.sh
index 8ac592192bbfe04cb7dd8d57c546f72b0d0db8b3..5c0b16841be5a9c101edc3aa735ce05f04f68183 100644 (file)
--- a/clustermd_tests/func.sh
+++ b/clustermd_tests/func.sh
@@ -196,9 +196,8 @@ do_setup()
        ulimit -c unlimited
 }
 
-cleanup()
+do_clean()
 {
-       check_ssh
        for ip in $NODE1 $NODE2
        do
                ssh $ip "mdadm -Ssq; dmesg -c > /dev/null"
@@ -206,6 +205,12 @@ cleanup()
        mdadm --zero ${devlist[@]} &> /dev/null
 }
 
+cleanup()
+{
+       check_ssh
+       do_clean
+}
+
 # check: $1/cluster_node $2/feature $3/optional
 check()
 {

diff --git a/test b/test
index 024cb634cac00bfded7a814c7a0c0787e4185f6e..111a2e740eae90d07e058de26d5cfd42134c0524 100755 (executable)
--- a/test
+++ b/test
@@ -82,11 +82,9 @@ do_test() {
        if [ -f "$_script" ]
        then
                rm -f $targetdir/stderr
-               # stop all arrays, just incase some script left an array active.
-               $mdadm -Ssq 2> /dev/null
-               mdadm --zero $devlist 2> /dev/null
                # this might have been reset: restore the default.
                echo 2000 > /proc/sys/dev/raid/speed_limit_max
+               do_clean
                # source script in a subshell, so it has access to our
                # namespace, but cannot change it.
                echo -ne "$_script... "

diff --git a/tests/func.sh b/tests/func.sh
index 3958090779c719cf50e33dde594b5dfcd9ed8404..a6995f1b31e40bb225d265e749fdb396c8d7f1f5 100644 (file)
--- a/tests/func.sh
+++ b/tests/func.sh
@@ -88,6 +88,13 @@ cleanup() {
        esac
 }
 
+do_clean()
+{
+       mdadm -Ss > /dev/null
+       mdadm --zero $devlist 2> /dev/null
+       dmesg -c > /dev/null
+}
+
 check_env() {
        user=$(id -un)
        [ "X$user" != "Xroot" ] && {
@@ -141,7 +148,6 @@ do_setup() {
 
        check_env
        [ -d $logdir ] || mkdir -p $logdir
-       dmesg -c > /dev/null
 
        devlist=
        if [ "$DEVTYPE" == "loop" ]