LU-15560 tests: remove the "libtool execute" commands

Remove unnecessary libtool usage from test scripts to
make test_125 of conf-sanity pass Maloo tests.

Test-Parameters: testlist=conf-sanity env=ONLY=125 serverversion=2.15
Signed-off-by: Xing Huang <hxing@ddn.com>
Change-Id: I5842e3dcbb77c37124a288f0e87173dc2fd5f02e
Reviewed-on: https://review.whamcloud.com/c/fs/lustre-release/+/49148
Tested-by: jenkins <devops@whamcloud.com>
Tested-by: Maloo <maloo@whamcloud.com>
Reviewed-by: Andreas Dilger <adilger@whamcloud.com>
Reviewed-by: Oleg Drokin <green@whamcloud.com>

diff --git a/debian/control b/debian/control
index ce40bfe..282c05c 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -84,7 +84,7 @@ Package: lustre-tests
 Section: utils
 Architecture: i386 armhf powerpc ppc64el amd64 ia64 arm64
 Priority: optional
-Depends: lustre-iokit (= ${binary:Version}), attr, rsync, perl, lsof, libtool, libtool-bin, mpi-default-bin
+Depends: lustre-iokit (= ${binary:Version}), attr, rsync, perl, lsof, mpi-default-bin
 Description: Test suite for the Lustre filesystem
  Lustre is a scalable, secure, robust, highly-available cluster file system.
  This release is maintained by Whamcloud and available from

diff --git a/debian/control.main b/debian/control.main
index ce40bfe..282c05c 100644 (file)
--- a/debian/control.main
+++ b/debian/control.main
@@ -84,7 +84,7 @@ Package: lustre-tests
 Section: utils
 Architecture: i386 armhf powerpc ppc64el amd64 ia64 arm64
 Priority: optional
-Depends: lustre-iokit (= ${binary:Version}), attr, rsync, perl, lsof, libtool, libtool-bin, mpi-default-bin
+Depends: lustre-iokit (= ${binary:Version}), attr, rsync, perl, lsof, mpi-default-bin
 Description: Test suite for the Lustre filesystem
  Lustre is a scalable, secure, robust, highly-available cluster file system.
  This release is maintained by Whamcloud and available from

diff --git a/lustre.spec.in b/lustre.spec.in
index bd212ee..17792a6 100644 (file)
--- a/lustre.spec.in
+++ b/lustre.spec.in
@@ -257,7 +257,7 @@ Requires: %{name} = %{version}
 %endif
 Requires: %{requires_kmod_name} = %{requires_kmod_version}
 Requires: %{requires_kmod_tests_name} = %{requires_kmod_version}
-Requires: attr, rsync, perl, lsof, libtool, /usr/bin/getconf
+Requires: attr, rsync, perl, lsof, /usr/bin/getconf
 
 %description tests
 This package contains a set of test binaries and scripts that are intended

diff --git a/lustre/tests/conf-sanity.sh b/lustre/tests/conf-sanity.sh
index 1b7b248..9b0b9da 100644 (file)
--- a/lustre/tests/conf-sanity.sh
+++ b/lustre/tests/conf-sanity.sh
@@ -8690,7 +8690,7 @@ test_125()
 
                echo "Before: ${facet} ${device} ${pre_max_sectors} ${max_hw_sectors}"
 
-               do_facet ${facet} "libtool execute l_tunedisk ${device}"
+               do_facet ${facet} "l_tunedisk ${device}"
 
                # Value after l_tunedisk
                local post_max_sectors=$(get_max_sectors_kb ${facet} ${device})

diff --git a/lustre/tests/sanity-hsm.sh b/lustre/tests/sanity-hsm.sh
index 1f8561e..cde194d 100755 (executable)
--- a/lustre/tests/sanity-hsm.sh
+++ b/lustre/tests/sanity-hsm.sh
@@ -150,14 +150,14 @@ get_mdt_devices() {
 
 search_copytools() {
        local hosts=${1:-$(facet_active_host $SINGLEAGT)}
-       do_nodesv $hosts "libtool execute pgrep -x $HSMTOOL"
+       do_nodesv $hosts "pgrep -x $HSMTOOL"
 }
 
 kill_copytools() {
        local hosts=${1:-$(facet_active_host $SINGLEAGT)}
 
        echo "Killing existing copytools on $hosts"
-       do_nodesv $hosts "libtool execute killall -q $HSMTOOL" || true
+       do_nodesv $hosts "killall -q $HSMTOOL" || true
        copytool_continue "$hosts"
 }
 
@@ -281,7 +281,7 @@ __lhsmtool_setup()
        cmd+=" \"$mountpoint\""
 
        echo "Starting copytool $facet on $(facet_host $facet)"
-       stack_trap "do_facet $facet libtool execute pkill -x '$HSMTOOL' || true" EXIT
+       stack_trap "do_facet $facet pkill -x '$HSMTOOL' || true" EXIT
        do_facet $facet "$cmd < /dev/null > \"$(copytool_logfile $facet)\" 2>&1"
 }
 
@@ -393,15 +393,15 @@ copytool_suspend() {
        local agents=${1:-$(facet_active_host $SINGLEAGT)}
 
        stack_trap \
-               "do_nodesv $agents libtool execute pkill -CONT -x '$HSMTOOL' || true" EXIT
-       do_nodesv $agents "libtool execute pkill -STOP -x $HSMTOOL" || return 0
+               "do_nodesv $agents pkill -CONT -x '$HSMTOOL' || true" EXIT
+       do_nodesv $agents "pkill -STOP -x $HSMTOOL" || return 0
        echo "Copytool is suspended on $agents"
 }
 
 copytool_continue() {
        local agents=${1:-$(facet_active_host $SINGLEAGT)}
 
-       do_nodesv $agents "libtool execute pkill -CONT -x $HSMTOOL" || return 0
+       do_nodesv $agents "pkill -CONT -x $HSMTOOL" || return 0
        echo "Copytool is continued on $agents"
 }
 
@@ -846,7 +846,7 @@ get_agent_uuid() {
 
        # Lustre mount-point is mandatory and last parameter on
        # copytool cmd-line.
-       local mntpnt=$(do_rpc_nodes $agent libtool execute ps -C $HSMTOOL -o args= |
+       local mntpnt=$(do_rpc_nodes $agent ps -C $HSMTOOL -o args= |
                       awk '{print $NF}')
        [ -n "$mntpnt" ] || error "Found no Agent or with no mount-point "\
                                  "parameter"