From e6eeb27f27a9b2268f55ce370ebd94197a01e66a Mon Sep 17 00:00:00 2001
From: Mathieu Faverge <mathieu.faverge@inria.fr>
Date: Thu, 1 Oct 2020 13:40:12 +0200
Subject: [PATCH] Prefix wrapper testings by the language
---
wrappers/fortran90/CMakeLists.txt | 2 +-
wrappers/julia/CMakeLists.txt | 15 +++++----------
wrappers/python/CMakeLists.txt | 6 +++---
3 files changed, 9 insertions(+), 14 deletions(-)
diff --git a/wrappers/fortran90/CMakeLists.txt b/wrappers/fortran90/CMakeLists.txt
index 6c1d05a1..1f1e70d0 100644
--- a/wrappers/fortran90/CMakeLists.txt
+++ b/wrappers/fortran90/CMakeLists.txt
@@ -99,7 +99,7 @@ foreach (_file ${EXAMPLES})
set( exe ${MPIEXEC_EXECUTABLE} -np 4 --host localhost:4 )
endif()
- add_test(${version}_fortran_${_name_we} ${exe} ./${_name_we})
+ add_test(fortran_${version}_${_name_we} ${exe} ./${_name_we})
endforeach()
endforeach()
diff --git a/wrappers/julia/CMakeLists.txt b/wrappers/julia/CMakeLists.txt
index 653ef172..9aec14c7 100644
--- a/wrappers/julia/CMakeLists.txt
+++ b/wrappers/julia/CMakeLists.txt
@@ -107,29 +107,24 @@ if ( Julia_ENABLE_TESTS )
set( _julia_init_ ${Julia_EXECUTABLE} "--project" "-e" "using Pkg\; Pkg.activate(\"spm\")\; Pkg.instantiate()" )
endif()
- add_test( shm_julia_set_mpi ${_julia_init_} )
- set_tests_properties( shm_julia_set_mpi
+ add_test( julia_init ${_julia_init_} )
+ set_tests_properties( julia_init
PROPERTIES ENVIRONMENT "${Julia_ENVIRONEMENT}" )
- if ( SPM_WITH_MPI )
- add_test( mpi_julia_set_mpi ${_julia_init_} )
- set_tests_properties( mpi_julia_set_mpi
- PROPERTIES ENVIRONMENT "${Julia_ENVIRONEMENT}" )
- endif()
set( JULIA_TESTS
spm_driver spm_user )
foreach( example ${JULIA_TESTS} )
- set( _test_suffix_ julia_${example} )
+ set( _test_suffix_ ${example} )
set( _test_file_ ${CMAKE_CURRENT_BINARY_DIR}/spm/examples/${example}.jl )
- set( _test_name_ shm_${_test_suffix_} )
+ set( _test_name_ julia_shm_${_test_suffix_} )
add_test( ${_test_name_} ${Julia_EXECUTABLE} ${_test_file_} )
set_tests_properties( ${_test_name_}
PROPERTIES ENVIRONMENT "${Julia_ENVIRONEMENT}" )
if (SPM_WITH_MPI)
- set( _test_name_ mpi_${_test_suffix_} )
+ set( _test_name_ julia_mpi_${_test_suffix_} )
add_test( ${_test_name_} ${MPIEXEC_EXECUTABLE} -np 4 --host localhost:4 ${Julia_EXECUTABLE} ${_test_file_} )
set_tests_properties( ${_test_name_}
PROPERTIES ENVIRONMENT "${Julia_ENVIRONEMENT}" )
diff --git a/wrappers/python/CMakeLists.txt b/wrappers/python/CMakeLists.txt
index 08f7252a..0b039d48 100644
--- a/wrappers/python/CMakeLists.txt
+++ b/wrappers/python/CMakeLists.txt
@@ -61,16 +61,16 @@ if (Python3_Interpreter_FOUND)
spm_driver spm_scipy )
foreach(example ${PYTHON_TESTS} )
- set( _test_suffix_ python_${example} )
+ set( _test_suffix_ ${example} )
set( _test_file_ ${CMAKE_CURRENT_BINARY_DIR}/examples/${example}.py )
- set( _test_name_ shm_${_test_suffix_} )
+ set( _test_name_ python_shm_${_test_suffix_} )
add_test( ${_test_name_} ${Python3_EXECUTABLE} ${_test_file_} )
set_tests_properties( ${_test_name_}
PROPERTIES ENVIRONMENT "PYTHONPATH=${CMAKE_CURRENT_BINARY_DIR}")
if (SPM_WITH_MPI)
- set( _test_name_ mpi_${_test_suffix_} )
+ set( _test_name_ python_mpi_${_test_suffix_} )
add_test( ${_test_name_} ${MPIEXEC_EXECUTABLE} -np 4 --host localhost:4 ${Python3_EXECUTABLE} ${_test_file_} )
set_tests_properties( ${_test_name_}
PROPERTIES ENVIRONMENT "PYTHONPATH=${CMAKE_CURRENT_BINARY_DIR}")
--
GitLab