Merge branches 'neok/rework-slice' and 'fix-issue-#506'

 - Fixes #506
 -  merge 2 branches at once w/ octopuss merge strategy

Author: zbeekman

CMakeLists.txt

@@ -657,8 +657,8 @@ if(opencoarrays_aware_compiler)
     add_caf_test(comp_allocated_2 2 comp_allocated_2)
     add_caf_test(alloc_comp_get_convert_nums 2 alloc_comp_get_convert_nums)
     if(NOT CMAKE_Fortran_COMPILER_VERSION VERSION_LESS 8)
-      add_caf_test(team_number 2 ${tests_root}/unit/teams/team_number)
-      add_caf_test(get_communicator 3 ${tests_root}/unit/teams/get_communicator)
+      add_caf_test(team_number 2 team_number)
+      add_caf_test(get_communicator 3  get_communicator)
     endif()
   endif()
 

src/tests/unit/teams/CMakeLists.txt

@@ -1,9 +1,2 @@
-add_executable(team_number team-number.f90)
-target_link_libraries(team_number OpenCoarrays)
-#TODO: Remove when gfortran supports team_number()
-target_include_directories(team_number PRIVATE ${CMAKE_BINARY_DIR}/include)
-
-#add_executable(get_communicator get-communicator.f90)
-#target_link_libraries(get_communicator OpenCoarrays)
-#TODO: Remove when gfortran supports team_number()
-#target_include_directories(get_communicator PRIVATE ${CMAKE_BINARY_DIR}/include)
+caf_compile_executable(team_number team-number.f90)
+caf_compile_executable(get_communicator get-communicator.f90)

src/tests/unit/teams/get-communicator.f90

@@ -1,6 +1,6 @@
 ! BSD 3-Clause License
 !
-! Copyright (c) 2016, Sourcery Institute
+! Copyright (c) 2018, Sourcery Institute
 ! All rights reserved.
 !
 ! Redistribution and use in source and binary forms, with or without
@@ -83,6 +83,7 @@ pure function destination_team(image,numTeams) result(team)
    end function
 
   subroutine mpi_matches_caf(comm)
+    use mpi
     use iso_c_binding, only : c_int
     integer(c_int), intent(in) :: comm
       !! MPI communicator

src/tests/unit/teams/team-number.f90

@@ -1,6 +1,6 @@
 ! BSD 3-Clause License
 !
-! Copyright (c) 2016, Sourcery Institute
+! Copyright (c) 2018, Sourcery Institute
 ! All rights reserved.
 !
 ! Redistribution and use in source and binary forms, with or without