Merge pull request #284 from sourceryinstitute/timer-and-travis-update

Add safer timeout for GCC 7 test and compact .travis.yml

Author: zbeekman

.travis.yml

@@ -27,48 +27,36 @@ matrix:
       env:
        - BUILD_TYPE="InstallScript"
          OSX_PACKAGES="gcc"
-    - os: linux
+    - &ubuntu
+      os: linux
       sudo: false
       env:
         - BUILD_TYPE="CodeCoverage"
       cache:
+        apt: false
         directories:
           - "$CACHE"
       addons:
         apt:
           sources:
-            - george-edison55-precise-backports
             - ubuntu-toolchain-r-test
+            - george-edison55-precise-backports
           packages:
             - gcc-6
             - gfortran-6
             - g++-6
             - binutils
             - cmake-data
             - cmake
-    - os: linux
-      sudo: false
+    -
+      <<: *ubuntu
       env:
         - BUILD_TYPE="Release"
-      cache:
-        directories:
-          - "$CACHE"
-      addons:
-        apt:
-          sources:
-            - george-edison55-precise-backports
-            - ubuntu-toolchain-r-test
-          packages:
-            - gcc-6
-            - gfortran-6
-            - g++-6
-            - binutils
-            - cmake-data
-            - cmake
-    - os: linux
-      sudo: false
+    -
+      <<: *ubuntu
       env:
         - BUILD_TYPE="InstallScript"
+      cache: false
       addons:
         apt:
           sources:

CMakeLists.txt

@@ -372,6 +372,7 @@ if(opencoarrays_aware_compiler)
     add_mpi_test(async_comp_alloc 6 ${tests_root}/unit/init_register/async_comp_alloc)
     # Timeout async_comp_alloc test after 3 seconds to progess past the known failure
     set_property(TEST async_comp_alloc PROPERTY TIMEOUT_AFTER_MATCH 3 "known failure")
+    set_property(TEST async_comp_alloc PROPERTY TIMEOUT 6) # in the event old CMake is being used
   endif()
   add_mpi_test(get_array 2 ${tests_root}/unit/send-get/get_array)
   add_mpi_test(get_self 2 ${tests_root}/unit/send-get/get_self)