Merge pull request #375 from sourceryinstitute/issue-342-developer-test-flag

Urgent bugfix: Fixes 342 developer test flag

Author: zbeekman

.travis.yml

@@ -7,8 +7,8 @@ env:
     - MPICH_URL_HEAD="http://www.mpich.org/static/downloads/$MPICH_VER"
     - MPICH_URL_TAIL="mpich-${MPICH_VER}.tar.gz"
     - MPICH_DIR="$HOME/.local/usr/mpich"
-    - MPICH_BOT_URL_HEAD="https://github.com/sourceryinstitute/opencoarrays/files/452136/"
-    - MPICH_BOT_URL_TAIL="mpich-3.2_2.yosemite.bottle.1.tar.gz"
+    - MPICH_BOT_URL_HEAD="https://github.com/sourceryinstitute/OpenCoarrays/files/976766/"
+    - MPICH_BOT_URL_TAIL="mpich-3.2_3.yosemite.bottle.1.tar.gz"
     - FC=gfortran-6
     - CC=gcc-6
     - CXX=g++-6
@@ -18,15 +18,15 @@ matrix:
     - os: osx
       env:
         - BUILD_TYPE="CodeCoverage"
-          OSX_PACKAGES="gcc cmake"
+          OSX_PACKAGES="gcc@6 cmake"
     - os: osx
       env:
        - BUILD_TYPE="Release"
-         OSX_PACKAGES="gcc cmake"
+         OSX_PACKAGES="gcc@6 cmake"
     - os: osx
       env:
        - BUILD_TYPE="InstallScript"
-         OSX_PACKAGES="gcc"
+         OSX_PACKAGES="gcc@6"
     - &ubuntu
       os: linux
       sudo: false
@@ -119,8 +119,10 @@ install:
         if ! [[ "$(brew ls --versions mpich)" ]]; then
           brew install --force-bottle mpich
         fi
-        mpif90 --version
-        mpicc --version
+        rm -rf /usr/local/opt/gcc || true
+        ln -s /usr/local/opt/gcc@6 /usr/local/opt/gcc # hack to get dynamic linker to find gcc 6 stuff
+        mpif90 --version || mpif90 -show
+        mpicc --version || mpicc -show
         cmake --version
       elif [[ "X$BUILD_TYPE" = "XInstallScript" ]]; then # uninstall some stuff if present
         [[ "$(brew ls --versions cmake)" ]] && brew rm cmake || true

CMakeLists.txt

@@ -6,6 +6,14 @@ set ( CMAKE_BUILD_TYPE "Release"
   CACHE STRING "Select which configuration to build." )
 set_property ( CACHE CMAKE_BUILD_TYPE PROPERTY STRINGS ${CMAKE_CONFIGURATION_TYPES} )
 
+# Add option and check environment to determine if developer tests should be run
+if(ENV{OPENCOARRAYS_DEVELOPER})
+  option(RUN_DEVELOPER_TESTS "Run tests intended only for developers" ON)
+else()
+  option(RUN_DEVELOPER_TESTS "Run tests intended only for developers" OFF)
+endif()
+mark_as_advanced(RUN_DEVELOPER_TESTS)
+
 # Name project and specify source languages
 # Parse version from .VERSION file so that more info can be added and easier to get from scripts
 file( STRINGS ".VERSION" OpenCoarraysVersion
@@ -468,10 +476,12 @@ if(opencoarrays_aware_compiler)
     add_mpi_test(register_alloc_comp_1 2 ${tests_root}/unit/init_register/register_alloc_comp_1)
     add_mpi_test(register_alloc_comp_2 2 ${tests_root}/unit/init_register/register_alloc_comp_2)
     add_mpi_test(register_alloc_comp_3 2 ${tests_root}/unit/init_register/register_alloc_comp_3)
-    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
+    if (RUN_DEVELOPER_TESTS)
+      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()
   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)
@@ -508,7 +518,9 @@ if(opencoarrays_aware_compiler)
     # GFortran PR 78505 only fixed on trunk/gcc 7
     add_mpi_test(source-alloc-no-sync 8 ${tests_root}/regression/reported/source-alloc-sync)
   endif()
-  add_mpi_test(convert-before-put 3 ${tests_root}/regression/reported/convert-before-put)
+  if (RUN_DEVELOPER_TESTS)
+    add_mpi_test(convert-before-put 3 ${tests_root}/regression/reported/convert-before-put)
+  endif()
   add_mpi_test(event-post 3 ${tests_root}/regression/reported/event-post)
   add_mpi_test(co_reduce-factorial 4 ${tests_root}/regression/reported/co_reduce-factorial)
   add_mpi_test(co_reduce-factorial-int8 4 ${tests_root}/regression/reported/co_reduce-factorial-int8)