Merge branch 'update-travis' of github.com:sourceryinstitute/OpenCoarrays

Author: zbeekman

.travis.yml

@@ -1,45 +1,67 @@
 ---
-language: c
+language: minimal
 
 os: osx
 
 env:
   global:
-#    - ZERO_AR_DATE=1
+    - ZERO_AR_DATE=1
     - TZ=UTC
     - CACHE="${HOME}/.local"
-    - MPICH_VER="3.2.1"
+    - MPICH_VER="3.3"
     - MPICH_URL_HEAD="https://www.mpich.org/static/downloads/${MPICH_VER}"
     - MPICH_URL_TAIL="mpich-${MPICH_VER}.tar.gz"
-    - MPICH_GCC6_BOT_URL_HEAD="https://github.com/sourceryinstitute/OpenCoarrays/files/1956499/"
-    - MPICH_GCC7_BOT_URL_HEAD="https://github.com/sourceryinstitute/OpenCoarrays/files/1956441/"
-    - MPICH_BOT_URL_TAIL="mpich-3.2.1_1.high_sierra.bottle.1.tar.gz"
     - BUILD_TYPES="Debug RelWithDebInfo Release CodeCoverage"
     - PATH="${HOME}/.local/bin:$PATH"
-  # matrix:
-  #   - GCC="6 7" OSX_PACKAGES="gcc@7 gcc@6 cmake shellcheck" BUILD_TYPE="cmake"
 
 matrix:
   fast_finish: true
   include:
     - &macOS
       os: osx
+      osx_image: xcode10.2
       env:
         - BUILD_TYPE="InstallScript"
           GCC=9
-          OSX_PACKAGES="gcc shellcheck cmake mpich"
-          # cmake should be removed, but we should be installing binaries
-          # because building from source takes forever
-    # -
-    #   <<: *macOS
-    #   env:
-    #     - GCC=8
-    #       BUILD_TYPES="debug RelWithDebInfo Release"
-    #       OSX_PACKAGES="gcc openmpi shellcheck cmake"
+          CC=gcc-9
+          CXX=g++-9
+          FC=gfortran-9
+      addons:
+        homebrew:
+          packages:
+            - gcc
+            - mpich
+            - shellcheck
+          update: true
+    - &macOS_allowed_failure
+      <<: *macOS
+      env:
+        - GCC=9
+          FC=gfortran-${GCC}
+          BUILD_TYPES="Release CodeCoverage"
+      addons:
+        homebrew:
+          packages:
+            - cmake
+            - gcc
+            - openmpi
+            - shellcheck
+          update: true
+    -
+      <<: *macOS
+      env:
+        - GCC=9
+          FC=gcc-${GCC}
+          CC=gcc-${GCC}
+          CXX=g++-${GCC}
+      addons:
+        homebrew:
+          brewfile: true
+          update: true
     - &ubuntu
       os: linux
       sudo: false
-      dist: trusty
+      dist: xenial
       env:
         - GCC=8
       cache:
@@ -50,7 +72,8 @@ matrix:
         apt:
           sources: &linuxsrcs
             - ubuntu-toolchain-r-test
-            - george-edison55-precise-backports
+            - sourceline: 'deb https://apt.kitware.com/ubuntu/ xenial main'
+              key_url: 'https://apt.kitware.com/keys/kitware-archive-latest.asc'
           packages: &gcc8pkgs
             - gcc-8
             - gfortran-8
@@ -92,11 +115,12 @@ matrix:
 
   allow_failures:
     - *linux_allowed_failure
-    - osx
+    - *macOS_allowed_failure
+
+    # macOS allowed failure due to random test timeouts w/ clang & OpenMPI
 
 before_install:
   - source developer-scripts/travis/before_install.all.sh
-  - developer-scripts/travis/before_install.${TRAVIS_OS_NAME}.sh
 
 install:
   - pwd
@@ -105,6 +129,9 @@ install:
 script:
   - pwd
   - export SOURCE_DATE_EPOCH=$(git show -s --format=%ct $TRAVIS_COMMIT)
+  - export LC_ALL=C
+  - export TZ=UTC
+  - export ZERO_AR_DATE=1
   - echo "SOURCE_DATE_EPOCH = ${SOURCE_DATE_EPOCH}"
   - ./developer-scripts/travis/test-script.${BUILD_TYPE:-cmake}.sh
 
@@ -113,56 +140,6 @@ after_script:
   - for version in ${GCC}; do bash <(curl -s https://codecov.io/bash) -x $(type -P gcov-${GCC}) >> coverage.log 2>> coverage.err || true ; done
   - tail coverage.log || true
   - tail coverage.err || true
-  - |
-    if [[ "${TRAVIS_TAG}" ]]; then
-      if [[ "v${TRAVIS_TAG}" != "v$(sed -n '/[0-9]\{1,\}\(\.[0-9]\{1,\}\)\{1,\}/{s/^\([^.]*\)\([0-9]\{1,\}\(\.[0-9]\{1,\}\)\{1,\}\)\(.*\)/\2/p;q;}' .VERSION)" ]]; then
-        echo "ERROR: You are trying to tag a new release but have a version missmatch in \`.VERSION\`"
-        false # throw an error
-      fi
-    fi
-
-# before_deploy:
-#   - git archive -v --prefix "OpenCoarrays-${TRAVIS_TAG}/" -o "OpenCoarrays-${TRAVIS_TAG}.tar.gz" ${TRAVIS_TAG}
-#   - |
-#     echo '# To verify cryptographic checksums `shasum -c opencoarrays-'"${TRAVIS_TAG}"'-SHA256.txt` on Mac OS X,' > "opencoarrays-${TRAVIS_TAG}-SHA256.txt
-#     echo '# `sha256sum -c  opencoarrays-'"${TRAVIS_TAG}"'-SHA256.txt` on Linux.' >> "opencoarrays-${TRAVIS_TAG}-SHA256.txt
-#     if [[ $(uname -s) == Darwin ]]; then
-#       shasum -a 256 "OpenCoarrays-${TRAVIS_TAG}.tar.gz" >> "opencoarrays-${TRAVIS_TAG}-SHA256.txt
-#     else
-#       sha256sum  "OpenCoarrays-${TRAVIS_TAG}.tar.gz" >> "opencoarrays-${TRAVIS_TAG}-SHA256.txt
-#     fi
-#   - |
-#     openssl aes-256-cbc -K ${encrypted_ef4535c39461_key} -iv ${encrypted_ef4535c39461_iv} -in subkey-328B3A0E-secret.asc.enc -out ./subkey-328B3A0E-secret.asc -d
-#     gpg --allow-secret-key-import --import ./subkey-328B3A0E-secret.asc && rm subkey-328B3A0E-secret.asc
-#     rm subkey-328B3A0E-secret.* || true
-#     unset encrypted_ef4535c39461_key || true
-#     unset encrypted_ef4535c39461_iv || true
-#     gpg --armor --detach-sign -u 328B3A0E --comment 'Mac users can use GPGTools - https://gpgtools.org' \
-#       --comment "Download Izaak Beekman's GPG public key from your" \
-#       --comment 'trusted key server or from' \
-#       --comment 'https://izaakbeekman.com/izaak.pubkey.txt' \
-#       --comment 'Next add it to your GPG keyring, e.g.,' \
-#       --comment '`curl https://izaakbeekman.com/izaak.pubkey.txt | gpg --import`' \
-#       --comment "Make sure you have verified that the release archive's" \
-#       --comment 'SHA256 checksum matches the provided' \
-#       --comment "opencoarrays-${TRAVIS_TAG}-SHA256.txt and ensure that this file" \
-#       --comment "and it's signature are in the same directory. Then" \
-#       --comment 'verify with:' \
-#       --comment '`gpg --verify opencoarrays-'"${TRAVIS_TAG}"'-SHA256.txt.asc`' \
-#       "opencoarrays-${TRAVIS_TAG}-SHA256.txt"
-
-# deploy:
-#   provider: releases
-#   api_key:
-#     secure: lBj4VgKhU74xfzPc0CDIji6cFrN/xEQIHLHjMcnDPWEF5JQe79aunMS5qiYu5ttve6khGI1WMFEe7clUO3TXiDUPyRMS4M8B2q3fuvUIsIbYgWcKq7ut+x6+dEQDj4DE3yWpPb8IDugWFp4vno1eQ2Rid1yr6Vn+rjnbE2i6z5SkXPnIv1ziQ9G+TF4ChUA8IOd1T78gJmML86P0rbt6nW8eVuJbza2y1ggHAY//q/b6rrbOFw5PqiOBqZ/BRrKJ5d2U2mvsoZtNn4OYyXw4eKEvNDIydwaIZROXfPRmN9zJ5G7+01QA5jlXpq17KfPBr7MXkn7nrQ5q9Z2ji4hRHk/AFzM/etfl1k4WCshYs13NlORpnU0vZtCMmmmsXWxj2kpsOHLWZQKdUAPs3olMPIG6aVnO5Abk1vrVSNy/ZeknbBTKCGScET1qRSaj6d43ynBwGkqHgaJdLBAwGe0Dpap6SsLGsAg56ZqHTngGlXB1KsbJKMkUsSC5RAgEuh9m55nsMaRlTYTrv+YADAQts7lV8yMCciMeJlrd3EYryyn4ZY1O82eOofhZZ5vQUktbXHtg6YnzguFwQyn+9yY/CQfi/vu2Aoq79NJEO/9UJ82ogn6gOoIebzb0xgIONjw4M68luR2U1CXtibzSYKWLGTeOj43khqZdbOpp6xncIv0=
-#   file:
-#     - "OpenCoarrays-${TRAVIS_TAG}.tar.gz"
-#     - "opencoarrays-${TRAVIS_TAG}-SHA256.txt"
-#     - "opencoarrays-${TRAVIS_TAG}-SHA256.txt.asc"
-#   skip_cleanup: true
-#   on:
-#     tags: true
-#    repo: sourceryinstitute/opencoarrays
 
 notifications:
   webhooks:

Brewfile

@@ -1,20 +1,19 @@
-# Brewfile to install OpenCoarrays prerequisites with [Homebrew] or [Linuxbrew].
+# Brewfile to install OpenCoarrays prerequisites with [Homebrew].
 #
 # TL;DR: `brew tap homebrew/bundle && brew bundle` to install prerequisites
 #
 # Homebrew for Mac OS X can be installed via:
 # `/usr/bin/ruby -e "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/master/install)"`
-# Linux brew (lives in userland, no sudo required) can be installed with:
-# `ruby -e "$(curl -fsSL https://raw.githubusercontent.com/Linuxbrew/linuxbrew/go/install)"`
+# Homebrew for Linux (lives in userland, no sudo required) can be installed with:
+# `sh -c "$(curl -fsSL https://raw.githubusercontent.com/Linuxbrew/install/master/install.sh)"`
 #
 # Once Homebrew/Linuxbrew is installed, execute the following commands to install the required prerequisites:
 # `brew tap homebrew/bundle && brew bundle`
 #
 
 brew 'cmake'
 brew 'gcc'
-brew 'mpich', args: ['cc=gcc-8', 'build-from-source']
-brew 'opencoarrays', args: ['cc=gcc-8', 'build-from-source']
+brew 'mpich' #, args: ['cc=gcc-9', 'build-from-source', 'verbose']
+# brew 'opencoarrays', args: ['cc=gcc-9', 'build-from-source', 'verbose']
 
 # [Homebrew]: http://brew.sh
-# [Linuxbrew]: http://linuxbrew.sh

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)

cmake/InstallFileManifest.cmake

@@ -1,3 +1,4 @@
+
 # This script will create and install an install manifest, including SHA256 hashes of each installed file
 # Variables passed from CMake must be set with `install(CODE "set(...)")`
 
@@ -6,7 +7,7 @@ message(STATUS "Generating SHA256 checksumed receipt for all installed assets")
 # Set receipt install destination
 set(RECEIPT_INSTALL_DIR "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_DATADIR}/${PROJECT_NAME}")
 
-# Mimic cmake_install.cmake's handlin of components
+# Mimic cmake_install.cmake's handling of components
 if(CMAKE_INSTALL_COMPONENT)
   set(HASHED_INSTALL_MANIFEST "install_manifest_${CMAKE_INSTALL_COMPONENT}.SHA256.txt")
 else()
@@ -16,10 +17,15 @@ endif()
 # Clean out any old install manifest on re-installation, if it exists
 file(REMOVE "${CMAKE_BINARY_DIR}/${HASHED_INSTALL_MANIFEST}")
 
+if(DEFINED ENV{DESTDIR})
+  get_filename_component(ABS_DESTDIR "$ENV{DESTDIR}" ABSOLUTE)
+else()
+  set(ABS_DESTDIR "")
+endif()
 # Loop over files computing hashes
 foreach(file IN LISTS CMAKE_INSTALL_MANIFEST_FILES)
-  file(SHA256 "${file}" _file_sha256)
-  file(RELATIVE_PATH FILE_REL_PATH "${RECEIPT_INSTALL_DIR}" "${file}")
+  file(SHA256 "$ENV{DESTDIR}${file}" _file_sha256)
+  file(RELATIVE_PATH FILE_REL_PATH "${ABS_DESTDIR}${RECEIPT_INSTALL_DIR}" "${ABS_DESTDIR}${file}")
   file(APPEND "${CMAKE_BINARY_DIR}/${HASHED_INSTALL_MANIFEST}" "${_file_sha256}  ${FILE_REL_PATH}\n")
 endforeach()
 file(APPEND "${CMAKE_BINARY_DIR}/${HASHED_INSTALL_MANIFEST}"

developer-scripts/travis/install.osx.sh

@@ -24,22 +24,7 @@ echo "Performing Travis-CI installation phase on macOS..."
 # Update and install via Homebrew on macOS
 brew update > /dev/null
 
-brew install gcc || true
-brew link --overwrite gcc || true
-
-for pkg in ${OSX_PACKAGES}; do
-    brew ls --versions "${pkg}" >/dev/null || brew install "${pkg}" || brew link --overwrite "${pkg}"
-    brew outdated "${pkg}" || brew upgrade "${pkg}"
-done
-
-# Uninstall mpich and openmpi so that we can install our own version
-#brew uninstall --force --ignore-dependencies openmpi || true
-#brew uninstall --force --ignore-dependencies mpich || true
-
-# Building CMake from source is very slow. We should be using binaries instead
-# if [[ "${BUILD_TYPE:-}" == InstallScript ]]; then # uninstall some stuff if present
-#     brew uninstall --force --ignore-dependencies cmake || true
-# fi
+brew outdated
 
 {
     mpif90 --version && mpif90 -show
@@ -51,4 +36,12 @@ done
 type -a cmake || echo "CMake not installed"
 cmake --version || true
 
+echo "CC: ${CC:-none defined}"
+echo "\$CC --version:"
+${CC:-} --version || true
+
+echo "FC: ${FC:-none-defined}"
+echo "\$FC --version:"
+${FC:-} --version || true
+
 echo "Done."

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

@@ -25,25 +25,9 @@ for version in ${GCC}; do
     mkdir "cmake-build-gcc${GCC}"
     export BLD_DIR="cmake-build-gcc${GCC}"
     export FC=gfortran-${version}
-    export CC=gcc-${version}
-    if [[ ${OSTYPE} == [Dd]arwin* ]]; then
-	# We should use clang on macOS because that's what homebrew and everyone else does
-	brew unlink openmpi || true
-	brew unlink mpich || true
-	for mpi in "mpich" "open-mpi"; do
-	    brew unlink "${mpi}" || true
-	    brew ls --versions "${mpi}" >/dev/null || brew install "${mpi}"
-	    brew outdated "${mpi}" || brew upgrade "${mpi}"
-	    brew unlink "${mpi}" || true
-	done
-	brew link --overwrite open-mpi
-	otool -L "$(brew --prefix open-mpi)/lib/libmpi.dylib"
-	otool -L "$(brew --prefix libevent)/lib/libevent.dylib"
-	OMPI_CC="$(brew --prefix gcc)/bin/gcc-${version}"
-	export OMPI_CC
-    fi
+
     ${FC} --version
-    ${CC} --version
+    ${CC:-cc} --version || true
     mpif90 --version && mpif90 -show
     mpicc --version && mpicc -show
 
@@ -56,19 +40,18 @@ for version in ${GCC}; do
 	    cmake -Wdev \
 		  -DCMAKE_INSTALL_PREFIX:PATH="${HOME}/OpenCoarrays" \
 		  -DCMAKE_BUILD_TYPE:STRING="${BUILD_TYPE}" \
-		  -DMPI_CXX_SKIP_MPICXX:BOOL=ON \
-		  -DMPI_ASSUME_NO_BUILTIN_MPI:BOOL=ON \
-		  -DMPI_SKIP_GUESSING:BOOL=ON\
 		  ..
 	    make -j 4
+	    printf '\nDone compiling OpenCoarrays and tests!\n'
 	    CTEST_FLAGS=(--output-on-failure --schedule-random --repeat-until-fail "${NREPEAT:-5}" --timeout "${TEST_TIMEOUT:-200}")
+	    printf "\nctest flags: %s\n" "${CTEST_FLAGS[*]}"
 	    if [[ "${BUILD_TYPE}" =~ Deb ]]; then
-		ctest "${CTEST_FLAGS[@]}" > "${BUILD_TYPE}.log" || cat "${BUILD_TYPE}.log"
+		printf "\nRunning ctest for a debug build...\n\n"
+		export NREPEAT=1
 	    else
-		ctest "${CTEST_FLAGS[@]}"
+		printf "\nRunning ctest for a non-debug build...\n\n"
 	    fi
-	    make install
-	    make hash_installed
+	    ctest "${CTEST_FLAGS[@]}"
 	    make install
 	    make uninstall
 	)

src/iso-fortran-binding/CMakeLists.txt

@@ -28,15 +28,10 @@ set_target_properties( ISO_Fortran_binding_static
 
 install(DIRECTORY "${CMAKE_BINARY_DIR}/${CMAKE_INSTALL_INCLUDEDIR}/" DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}" FILES_MATCHING PATTERN "*.h")
 
-install( TARGETS ISO_Fortran_binding
+install( TARGETS ISO_Fortran_binding ISO_Fortran_binding_static
   EXPORT OpenCoarraysTargets
-  DESTINATION "${CMAKE_INSTALL_LIBDIR}"
-  LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}"
-  PUBLIC_HEADER DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}"
-)
-install( TARGETS ISO_Fortran_binding_static
-  EXPORT OpenCoarraysTargets
-  DESTINATION "${CMAKE_INSTALL_LIBDIR}"
+  ARCHIVE DESTINATION "${CMAKE_INSTALL_LIBDIR}"
+  RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}"
   LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}"
   PUBLIC_HEADER DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}"
 )

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")

src/tests/unit/iso-fortran-binding/CMakeLists.txt

@@ -1,2 +1,2 @@
 add_executable( ISO_Fortran_binding_tests ISO_Fortran_binding_tests.c )
-target_link_libraries( ISO_Fortran_binding_tests ISO_Fortran_binding )
+target_link_libraries( ISO_Fortran_binding_tests ISO_Fortran_binding_static )