restore a couple of tests

This commit is contained in:
Radovan Bast 2016-05-20 20:55:10 +02:00
parent 30ced00c4f
commit 6896da511c
9 changed files with 70 additions and 116 deletions

View File

@ -1,15 +1,11 @@
[project]
name: example name: example
min_cmake_version: 2.8 min_cmake_version: 2.8
modules:
[cxx] - cxx:
source: ../../../modules/cxx.cmake - source: ../../../modules/cxx.cmake
- math:
[math] - source: ../../../modules/math/accelerate.cmake
source: ../../../modules/math/accelerate.cmake - default_build_paths:
- source: ../../../modules/default_build_paths.cmake
[default_build_paths] - src:
source: ../../../modules/default_build_paths.cmake - source: ../../../modules/src.cmake
[src]
source: ../../../modules/src.cmake

View File

@ -1,15 +1,11 @@
[project]
name: example name: example
min_cmake_version: 2.8 min_cmake_version: 2.8
modules:
[cxx] - cxx:
source: ../../../modules/cxx.cmake - source: ../../../modules/cxx.cmake
- math:
[math] - source: ../../../modules/math/cblas.cmake
source: ../../../modules/math/cblas.cmake - default_build_paths:
- source: ../../../modules/default_build_paths.cmake
[default_build_paths] - src:
source: ../../../modules/default_build_paths.cmake - source: ../../../modules/src.cmake
[src]
source: ../../../modules/src.cmake

View File

@ -1,12 +1,9 @@
[project]
name: example name: example
min_cmake_version: 2.8 min_cmake_version: 2.8
modules:
[cxx] - cxx:
source: ../../../modules/cxx.cmake - source: ../../../modules/cxx.cmake
- default_build_paths:
[default_build_paths] - source: ../../../modules/default_build_paths.cmake
source: ../../../modules/default_build_paths.cmake - src:
- source: ../../../modules/src.cmake
[src]
source: ../../../modules/src.cmake

View File

@ -1,15 +1,11 @@
[project]
name: example name: example
min_cmake_version: 2.8 min_cmake_version: 2.8
modules:
[fc] - fc:
source: ../../../modules/fc.cmake - source: ../../../modules/fc.cmake
- math:
[math] - source: ../../../modules/math/blas.cmake
source: ../../../modules/math/blas.cmake - default_build_paths:
- source: ../../../modules/default_build_paths.cmake
[default_build_paths] - src:
source: ../../../modules/default_build_paths.cmake - source: ../../../modules/src.cmake
[src]
source: ../../../modules/src.cmake

View File

@ -1,15 +1,11 @@
[project]
name: example name: example
min_cmake_version: 2.8 min_cmake_version: 2.8
modules:
[fc] - fc:
source: ../../../modules/fc.cmake - source: ../../../modules/fc.cmake
- default_build_paths:
[default_build_paths] - source: ../../../modules/default_build_paths.cmake
source: ../../../modules/default_build_paths.cmake - src:
- source: ../../../modules/src.cmake
[src] - git_info:
source: ../../../modules/src.cmake - source: ../../../modules/git_info/git_info.cmake
[git_info]
source: ../../../modules/git_info/git_info.cmake

View File

@ -1,15 +1,11 @@
[project]
name: example name: example
min_cmake_version: 2.8 min_cmake_version: 2.8
modules:
[fc] - fc:
source: ../../../modules/fc.cmake - source: ../../../modules/fc.cmake
- int64:
[int64] - source: ../../../modules/int64.cmake
source: ../../../modules/int64.cmake - default_build_paths:
- source: ../../../modules/default_build_paths.cmake
[default_build_paths] - src:
source: ../../../modules/default_build_paths.cmake - source: ../../../modules/src.cmake
[src]
source: ../../../modules/src.cmake

View File

@ -1,15 +1,11 @@
[project]
name: example name: example
min_cmake_version: 2.8 min_cmake_version: 2.8
modules:
[fc] - fc:
source: ../../../modules/fc.cmake - source: ../../../modules/fc.cmake
- math:
[math] - source: ../../../modules/math/lapack.cmake
source: ../../../modules/math/lapack.cmake - default_build_paths:
- source: ../../../modules/default_build_paths.cmake
[default_build_paths] - src:
source: ../../../modules/default_build_paths.cmake - source: ../../../modules/src.cmake
[src]
source: ../../../modules/src.cmake

View File

@ -1,15 +1,11 @@
[project]
name: example name: example
min_cmake_version: 2.8 min_cmake_version: 2.8
modules:
[fc] - fc:
source: ../../../modules/fc.cmake - source: ../../../modules/fc.cmake
- omp:
[omp] - source: ../../../modules/omp.cmake
source: ../../../modules/omp.cmake - default_build_paths:
- source: ../../../modules/default_build_paths.cmake
[default_build_paths] - src:
source: ../../../modules/default_build_paths.cmake - source: ../../../modules/src.cmake
[src]
source: ../../../modules/src.cmake

View File

@ -15,9 +15,6 @@ skip_on_linux = pytest.mark.skipif('sys.platform == "linux2"', reason="not worki
skip_always = pytest.mark.skipif('1 == 1', reason="tests are broken") skip_always = pytest.mark.skipif('1 == 1', reason="tests are broken")
# ------------------------------------------------------------------------------
def exe(command): def exe(command):
""" """
Executes command and returns string representations of stdout and stderr captured from the console. Executes command and returns string representations of stdout and stderr captured from the console.
@ -41,8 +38,6 @@ def exe(command):
return stdout, stderr return stdout, stderr
# ------------------------------------------------------------------------------
def configure_build_and_exe(name, setup_command, launcher=None): def configure_build_and_exe(name, setup_command, launcher=None):
@ -83,10 +78,7 @@ def configure_build_and_exe(name, setup_command, launcher=None):
assert 'PASSED' in stdout assert 'PASSED' in stdout
# ------------------------------------------------------------------------------
@skip_always
def test_extra_cmake_options(): def test_extra_cmake_options():
configure_build_and_exe('extra_cmake_options', 'python setup --cxx=g++ --cmake-options="-DENABLE_SOMETHING=OFF -DENABLE_FOO=ON"') configure_build_and_exe('extra_cmake_options', 'python setup --cxx=g++ --cmake-options="-DENABLE_SOMETHING=OFF -DENABLE_FOO=ON"')
@ -99,40 +91,33 @@ def test_fc():
configure_build_and_exe('fc', 'python setup --fc=gfortran') configure_build_and_exe('fc', 'python setup --fc=gfortran')
@skip_always
def test_fc_git_info(): def test_fc_git_info():
configure_build_and_exe('fc_git_info', 'python setup --fc=gfortran') configure_build_and_exe('fc_git_info', 'python setup --fc=gfortran')
@skip_always
def test_fc_int64(): def test_fc_int64():
configure_build_and_exe('fc_int64', 'python setup --fc=gfortran --int64') configure_build_and_exe('fc_int64', 'python setup --fc=gfortran --int64')
@skip_always
@skip_on_osx @skip_on_osx
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 --omp --fc=gfortran') configure_build_and_exe('fc_omp', 'python setup --omp --fc=gfortran')
@skip_always
def test_fc_blas(): def test_fc_blas():
configure_build_and_exe('fc_blas', 'python setup --fc=gfortran --blas') configure_build_and_exe('fc_blas', 'python setup --fc=gfortran --blas')
@skip_always
def test_fc_lapack(): def test_fc_lapack():
configure_build_and_exe('fc_lapack', 'python setup --fc=gfortran --lapack') configure_build_and_exe('fc_lapack', 'python setup --fc=gfortran --lapack')
@skip_always
@skip_on_osx @skip_on_osx
def test_cxx_cblas(): def test_cxx_cblas():
configure_build_and_exe('cxx_cblas', 'python setup --cxx=g++ --cblas') configure_build_and_exe('cxx_cblas', 'python setup --cxx=g++ --cblas')
@skip_always
@skip_on_linux @skip_on_linux
def test_cxx_accelerate(): def test_cxx_accelerate():
configure_build_and_exe('cxx_accelerate', 'python setup --cxx=g++ --accelerate') configure_build_and_exe('cxx_accelerate', 'python setup --cxx=g++ --accelerate')