RHEL8 has rpm-mpi-hooks which requires binaries
to be in specific mpi bin to generate the correct
requires
See https://fedoraproject.org//wiki/Changes/RpmMPIReqProv
and https://fedoraproject.org/wiki/Packaging:MPI
Test-Parameters: trivial clientdistro=el8 serverdistro=el7.6 testgroup=regression-mpi
Change-Id: Id9fa50e15b48b9da846083b9e9cd894ad1eac967
Signed-off-by: Minh Diep <mdiep@whamcloud.com>
Reviewed-on: https://review.whamcloud.com/35374
Tested-by: jenkins <devops@whamcloud.com>
Tested-by: Maloo <maloo@whamcloud.com>
Reviewed-by: Jian Yu <yujian@whamcloud.com>
Reviewed-by: Yang Sheng <ys@whamcloud.com>
Reviewed-by: Li Dongyang <dongyangli@ddn.com>
Reviewed-by: Oleg Drokin <green@whamcloud.com>
echo '%{_bindir}/munlink' >>lustre-tests.files
echo '%{_sbindir}/wirecheck' >>lustre-tests.files
echo '%{_sbindir}/wiretest' >>lustre-tests.files
+%if %{_vendor}=="redhat"
+if [ -n "@MPI_BIN@" ]; then
+ echo '@MPI_BIN@/*' >>lustre-tests.files
+fi
+%endif
%endif
%files -f lustre.files
case $enableval in
yes)
MPICC_WRAPPER="mpicc"
+ MPI_BIN=$(eval which $MPICC_WRAPPER | xargs dirname)
;;
no)
enable_mpitests="no"
+ MPI_BIN=""
;;
*)
MPICC_WRAPPER=$enableval
+ MPI_BIN=$(eval echo $MPICC_WRAPPER | xargs dirname)
;;
esac
], [
enable_mpitests="yes"
MPICC_WRAPPER="mpicc"
+ MPI_BIN=$(eval which $MPICC_WRAPPER | xargs dirname)
])
if test "x$enable_mpitests" != "xno"; then
enable_mpitests=$lb_cv_mpi_tests
CC=$oldcc
fi
+ AC_SUBST(MPI_BIN)
AC_SUBST(MPICC_WRAPPER)
]) # LB_CONFIG_MPITESTS
}
mpi_run () {
- local mpirun="$MPIRUN $MPIRUN_OPTIONS"
+ local mpirun="$MPIRUN $MPIRUN_OPTIONS --oversubscribe"
local command="$mpirun $@"
local mpilog=$TMP/mpi.log
local rc
fi
echo "tests: $tests"
for test in $tests; do
- local cmd="./runtests -N $cnt_NRUN $test -f $testdir"
+ local cmd="sh ./runtests -N $cnt_NRUN $test -f $testdir"
local rc=0
log "$cmd"
if TESTS
if MPITESTS
+if RHEL
+testdir = @MPI_BIN@
+else
testdir = $(libdir)/lustre/tests
+endif
test_PROGRAMS = $(THETESTS)
else
noinst_PROGRAMS = $(THETESTS)