Attempt to fix Travis-CI GCC9 + Clang + OMPI build

Author: zbeekman

.travis.yml

@@ -126,7 +126,7 @@ script:
   - pwd
   - export SOURCE_DATE_EPOCH=$(git show -s --format=%ct $TRAVIS_COMMIT)
   - echo "SOURCE_DATE_EPOCH = ${SOURCE_DATE_EPOCH}"
-  - ./developer-scripts/travis/test-script.${BUILD_TYPE:-cmake}.sh
+  - travis_wait ./developer-scripts/travis/test-script.${BUILD_TYPE:-cmake}.sh
 
 after_script:
   - find . -name '*.gcno' -print

CMakeLists.txt

@@ -697,8 +697,9 @@ function(add_caf_test name num_caf_img test_target)
     endif()
   endif()
   if( openmpi)
-    set (test_parameters ${test_parameters} --allow-run-as-root)
-    message( STATUS "Open-MPI back end detected, passing --allow-run-as-root to allow tests to pass when run with sudo or as root." )
+    if(NOT DEFINED ENV{TRAVIS})
+      set (test_parameters ${test_parameters} --allow-run-as-root)
+    endif()
   endif()
   set(test_parameters -np ${num_caf_img} ${test_parameters})
   if(DEFINED ARGN)

developer-scripts/travis/test-script.cmake.sh

@@ -27,7 +27,7 @@ for version in ${GCC}; do
     export FC=gfortran-${version}
 
     ${FC} --version
-    ${CC:-} --version || true
+    ${CC:-cc} --version || true
     mpif90 --version && mpif90 -show
     mpicc --version && mpicc -show
 
@@ -41,12 +41,13 @@ for version in ${GCC}; do
 		  -DCMAKE_INSTALL_PREFIX:PATH="${HOME}/OpenCoarrays" \
 		  -DCMAKE_BUILD_TYPE:STRING="${BUILD_TYPE}" \
 		  ..
-	    make -j 4
+	    ${TRAVIS:+ travis_wait} make -j 4
+	    printf '\nDone compiling OpenCoarrays and tests!\n\n'
 	    CTEST_FLAGS=(--output-on-failure --schedule-random --repeat-until-fail "${NREPEAT:-5}" --timeout "${TEST_TIMEOUT:-200}")
 	    if [[ "${BUILD_TYPE}" =~ Deb ]]; then
-		ctest "${CTEST_FLAGS[@]}" > "${BUILD_TYPE}.log" || cat "${BUILD_TYPE}.log"
+		${TRAVIS:+ travis_wait} ctest "${CTEST_FLAGS[@]}" > "${BUILD_TYPE}.log" || cat "${BUILD_TYPE}.log"
 	    else
-		ctest "${CTEST_FLAGS[@]}"
+		${TRAVIS:+ travis_wait} ctest "${CTEST_FLAGS[@]}"
 	    fi
 	    make install
 	    make uninstall

src/mpi/CMakeLists.txt

@@ -116,6 +116,10 @@ if (mpi_version_out MATCHES "[Oo]pen[ -][Mm][Pp][Ii]")
   set ( openmpi true PARENT_SCOPE)
   # Write out a host file because OMPI's mpiexec is dumb
   file(WRITE ${CMAKE_BINARY_DIR}/hostfile "${HOST_NAME} slots=${N_CPU}\n")
+  message( STATUS "hostfile written to: ${CMAKE_BINARY_DIR}/hostfile")
+  if(NOT DEFINED ENV{TRAVIS})
+    message( STATUS "Open-MPI back end detected, passing --allow-run-as-root to allow tests to pass when run with sudo or as root." )
+  endif()
 endif ()
 
 if("${CMAKE_Fortran_COMPILER_ID}" STREQUAL "GNU")