LU-5090 tests: disable MPI tests for Phi build

MPI tests are not supported for Phi build. So, disable them.
Fix configure messages and caching result of check.

Signed-off-by: Dmitry Eremin <dmitry.eremin@intel.com>
Change-Id: I1fab50500883e6d155c8f324a98bed01e5d96397
Reviewed-on: http://review.whamcloud.com/10508
Tested-by: Jenkins
Reviewed-by: Bob Glossman <bob.glossman@intel.com>
Reviewed-by: James Simmons <uja.ornl@gmail.com>
Tested-by: Maloo <hpdd-maloo@intel.com>
Reviewed-by: John L. Hammond <john.hammond@intel.com>
Reviewed-by: Oleg Drokin <oleg.drokin@intel.com>

diff --git a/config/lustre-build-linux.m4 b/config/lustre-build-linux.m4
index 665be9c..9d94761 100644 (file)
--- a/config/lustre-build-linux.m4
+++ b/config/lustre-build-linux.m4
@@ -173,6 +173,10 @@ AS_IF([test "$lb_cv_cross" = x86_64-k1om-linux -o \
                AC_MSG_WARN([Disabling server (not supported for $lb_cv_cross).])
                enable_server="no"
        ])
+       AS_IF([test "x$enable_mpitests" != xno], [
+               AC_MSG_WARN([Disabling MPI tests (not supported for $lb_cv_cross).])
+               enable_mpitests="no"
+       ])
 ])
 AC_SUBST(CROSS_VARS)
 AC_SUBST(CROSS_PATH)

diff --git a/lustre/autoconf/lustre-core.m4 b/lustre/autoconf/lustre-core.m4
index 0ed0ee1..ccafd38 100644 (file)
--- a/lustre/autoconf/lustre-core.m4
+++ b/lustre/autoconf/lustre-core.m4
@@ -1601,15 +1601,15 @@ AC_MSG_RESULT([$enable_client])
 #
 AC_DEFUN([LB_CONFIG_MPITESTS], [
 AC_ARG_ENABLE([mpitests],
-       AC_HELP_STRING([--enable-mpitests==yes|no|mpicc wrapper],
+       AC_HELP_STRING([--enable-mpitests=<yes|no|mpicc wrapper>],
                       [include mpi tests]), [
-               enable_mpitests=yes
+               enable_mpitests="yes"
                case $enableval in
                yes)
-                       MPICC_WRAPPER=mpicc
+                       MPICC_WRAPPER="mpicc"
                        ;;
                no)
-                       enable_mpitests=no
+                       enable_mpitests="no"
                        ;;
                *)
                        MPICC_WRAPPER=$enableval
@@ -1617,22 +1617,22 @@ AC_ARG_ENABLE([mpitests],
                esac
        ], [
                enable_mpitests="yes"
-               MPICC_WRAPPER=mpicc
+               MPICC_WRAPPER="mpicc"
        ])
 
-       if test x$enable_mpitests != xno; then
+       if test "x$enable_mpitests" != "xno"; then
                oldcc=$CC
                CC=$MPICC_WRAPPER
                AC_CACHE_CHECK([whether mpitests can be built],
-                               lb_cv_mpi_tests, [
-               AC_COMPILE_IFELSE([AC_LANG_SOURCE([
+               lb_cv_mpi_tests, [AC_COMPILE_IFELSE([AC_LANG_SOURCE([
                        #include <mpi.h>
                        int main(void) {
                                int flag;
                                MPI_Initialized(&flag);
                                return 0;
                        }
-               ])], [], [enable_mpitests="no"])
+               ])], [lb_cv_mpi_tests="yes"], [lb_cv_mpi_tests="no"
+                       enable_mpitests=$lb_cv_mpi_tests])
                ])
                CC=$oldcc
        fi