]> git.ipfire.org Git - thirdparty/mdadm.git/commitdiff
mdadm/test: mdadm needn't make install on the system
authorZhilong Liu <zlliu@suse.com>
Wed, 30 May 2018 07:04:05 +0000 (15:04 +0800)
committerJes Sorensen <jsorensen@fb.com>
Fri, 1 Jun 2018 16:46:13 +0000 (12:46 -0400)
Fixes: beb71de04d31 ("mdadm/test: enable clustermd testing under clustermd_tests/")
clustermd_tests/func.sh:
remove unnecessary 'make install', just ensure 'make everything' has done.
the original idea is to make the /sbin/mdadm version same as ./mdadm, and
this breakage has pointed out by commit:
59416da78fc6 ("tests/func.sh: Fix some total breakage in the test scripts")

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

index c2be0e59c9a0976f8678495f392502276e2885ba..642cc966ef61d56d00bd777ec1abacc885dd3077 100644 (file)
@@ -86,10 +86,13 @@ check_env()
                echo "testing can only be done as 'root'."
                exit 1
        }
+       [ \! -x $mdadm ] && {
+               echo "test: please run make everything before perform testing."
+               exit 1
+       }
        check_ssh
        commands=(mdadm iscsiadm bc modinfo dlm_controld
                  udevadm crm crm_mon lsblk pgrep sbd)
-       mdadm_src_ver="$($mdadm -V 2>&1)"
        for ip in $NODE1 $NODE2
        do
                for cmd in ${commands[@]}
@@ -99,12 +102,6 @@ check_env()
                                exit 1
                        }
                done
-               mdadm_sbin_ver="$(ssh $ip "mdadm -V 2>&1")"
-               if [ "$mdadm_src_ver" != "$mdadm_sbin_ver" ]
-               then
-                       echo "$ip: please run 'make install' before testing."
-                       exit 1
-               fi
                mods=(raid1 raid10 md_mod dlm md-cluster)
                for mod in ${mods[@]}
                do