s/no_windows/skip_on_windows/

This commit is contained in:
Radovan Bast 2015-08-10 20:15:35 +02:00
parent de5cd2af19
commit 0596b03767

View File

@ -10,7 +10,7 @@ import pytest
HERE = os.path.abspath(os.path.dirname(__file__)) HERE = os.path.abspath(os.path.dirname(__file__))
no_windows = pytest.mark.skipif(sys.platform == 'win32', skip_on_windows = pytest.mark.skipif(sys.platform == 'win32',
reason="windows not supported") reason="windows not supported")
# ------------------------------------------------------------------------------ # ------------------------------------------------------------------------------
@ -157,14 +157,14 @@ def test_fc_int64():
# ------------------------------------------------------------------------------ # ------------------------------------------------------------------------------
@no_windows @skip_on_windows
def test_fc_mpi(): def test_fc_mpi():
configure_build_and_exe('fc_mpi', 'python setup.py --mpi --fc=mpif90', 'mpirun -np 2') configure_build_and_exe('fc_mpi', 'python setup.py --mpi --fc=mpif90', 'mpirun -np 2')
# ------------------------------------------------------------------------------ # ------------------------------------------------------------------------------
@no_windows @skip_on_windows
def test_fc_omp(): def test_fc_omp():
os.environ['OMP_NUM_THREADS'] = '2' os.environ['OMP_NUM_THREADS'] = '2'
configure_build_and_exe('fc_omp', 'python setup.py --omp --fc=gfortran') configure_build_and_exe('fc_omp', 'python setup.py --omp --fc=gfortran')
@ -176,23 +176,23 @@ def test_fc_static():
# ------------------------------------------------------------------------------ # ------------------------------------------------------------------------------
@no_windows @skip_on_windows
def test_fc_blas(): def test_fc_blas():
configure_build_and_exe('fc_blas', 'python setup.py --fc=gfortran') configure_build_and_exe('fc_blas', 'python setup.py --fc=gfortran')
@no_windows @skip_on_windows
def test_fc_blas_static(): def test_fc_blas_static():
configure_build_and_exe('fc_blas', 'python setup.py --fc=gfortran --static') configure_build_and_exe('fc_blas', 'python setup.py --fc=gfortran --static')
# ------------------------------------------------------------------------------ # ------------------------------------------------------------------------------
@no_windows @skip_on_windows
def test_fc_lapack(): def test_fc_lapack():
configure_build_and_exe('fc_lapack', 'python setup.py --fc=gfortran') configure_build_and_exe('fc_lapack', 'python setup.py --fc=gfortran')
@no_windows @skip_on_windows
def test_fc_lapack_static(): def test_fc_lapack_static():
configure_build_and_exe('fc_lapack', 'python setup.py --fc=gfortran --static --cmake-options="-DMATH_LIB_SEARCH_ORDER=ATLAS"') configure_build_and_exe('fc_lapack', 'python setup.py --fc=gfortran --static --cmake-options="-DMATH_LIB_SEARCH_ORDER=ATLAS"')