Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -77,6 +77,7 @@ matrix:

before_install:
- |
set -o errexit
if [[ $TRAVIS ]] && [[ "X$TRAVIS_OS_NAME" = "Xosx" ]]; then
export PATH="$PATH:$HOME/Library/Python/2.7/bin"
else
Expand All @@ -88,9 +89,11 @@ before_install:
$FC --version
$CC --version
fi
set +o errexit

install:
- |
set -o errexit
if [[ $TRAVIS ]] && [[ "X$TRAVIS_OS_NAME" = "Xosx" ]]; then
brew update > /dev/null

Expand Down Expand Up @@ -141,9 +144,11 @@ install:
export FC=mpif90
export CC=mpicc
fi
set +o errexit

script:
- |
set -o errexit
if [[ "X$BUILD_TYPE" = "XInstallScript" ]]; then
export FC=gfortran-5
export CC=gcc-5
Expand All @@ -163,6 +168,7 @@ script:
make install
cd ..
fi
set +o errexit

after_success:
- find . -name '*.gcno' -print
Expand Down
4 changes: 1 addition & 3 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -166,9 +166,7 @@ if(opencoarrays_aware_compiler)
add_mpi_test(register_rename_me 2 ${tests_root}/unit/init_register/register_rename_me)
add_mpi_test(register_rename_me_too 2 ${tests_root}/unit/init_register/register_rename_me_too)
add_mpi_test(allocate_as_barrier 2 ${tests_root}/unit/init_register/allocate_as_barrier)
if (NOT ( APPLE AND ( DEFINED ENV{TRAVIS} ) ) )
add_mpi_test(allocate_as_barrier_proc 2 ${tests_root}/unit/init_register/allocate_as_barrier_proc)
endif ()
add_mpi_test(allocate_as_barrier_proc 32 ${tests_root}/unit/init_register/allocate_as_barrier_proc)
add_mpi_test(get_array 2 ${tests_root}/unit/send-get/get_array)
add_mpi_test(send_array 2 ${tests_root}/unit/send-get/send_array)
add_mpi_test(get_with_offset_1d 2 ${tests_root}/unit/send-get/get_with_offset_1d)
Expand Down
3 changes: 2 additions & 1 deletion src/mpi/mpi_caf.c
Original file line number Diff line number Diff line change
Expand Up @@ -533,9 +533,10 @@ void *
MPI_Win_flush(caf_this_image-1, *p);
# endif // CAF_MPI_LOCK_UNLOCK
free(init_array);
PREFIX(sync_all) (NULL,NULL,0);
}

PREFIX(sync_all) (NULL,NULL,0);

caf_static_t *tmp = malloc (sizeof (caf_static_t));
tmp->prev = caf_tot;
tmp->token = *token;
Expand Down
2 changes: 1 addition & 1 deletion src/tests/integration/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
if (opencoarrays_aware_compiler)
add_subdirectory(coarrayHelloWorld)
if (NOT (DEFINED ENV{TRAVIS}))
if (NOT ("${CMAKE_BUILD_TYPE}" MATCHES "CodeCoverage"))
add_subdirectory(dist_transpose )
endif()
add_subdirectory(pde_solvers)
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# checking whether the machine is of type 64-bit before proceeding further
if ( ("${CMAKE_SYSTEM_PROCESSOR}" MATCHES "x86_64") AND ("${CMAKE_SYSTEM_NAME}" MATCHES "LINUX") )
if ( ("${CMAKE_SYSTEM_PROCESSOR}" MATCHES "x86_64") AND ("${CMAKE_SYSTEM_NAME}" MATCHES "Linux") )
# Default to older SSE-instruction-based FFT library
if (NOT (DEFINED ENV{TRAVIS}))
if (LEGACY_ARCHITECTURE OR (NOT DEFINED(LEGACY_ARCHITECTURE)))
Expand Down