convert python tests to new form

This commit is contained in:
Radovan Bast 2016-05-20 20:58:43 +02:00
parent 6896da511c
commit bfeef557e7
5 changed files with 42 additions and 64 deletions

View File

@ -1,15 +1,13 @@
[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
- python_interpreter:
[python_interpreter] - source: ../../../modules/python_interpreter.cmake
source: ../../../modules/python_interpreter.cmake - python_libs:
- source: ../../../modules/python_libs.cmake
[default_build_paths] - default_build_paths:
source: ../../../modules/default_build_paths.cmake - source: ../../../modules/default_build_paths.cmake
- src:
[src] - source: ../../../modules/src.cmake
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
- python_interpreter:
[python_interpreter] - source: ../../../modules/python_interpreter.cmake
source: ../../../modules/python_interpreter.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,18 +1,13 @@
[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
- python_interpreter:
[python_interpreter] - source: ../../../modules/python_interpreter.cmake
source: ../../../modules/python_interpreter.cmake - python_libs:
- source: ../../../modules/python_libs.cmake
[python_libs] - default_build_paths:
source: ../../../modules/python_libs.cmake - source: ../../../modules/default_build_paths.cmake
- src:
[default_build_paths] - source: ../../../modules/src.cmake
source: ../../../modules/default_build_paths.cmake
[src]
source: ../../../modules/src.cmake

View File

@ -1,18 +1,13 @@
[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
- python_interpreter:
[python_interpreter] - source: ../../../modules/python_interpreter.cmake
source: ../../../modules/python_interpreter.cmake - python_libs:
- source: ../../../modules/python_libs.cmake
[python_libs] - default_build_paths:
source: ../../../modules/python_libs.cmake - source: ../../../modules/default_build_paths.cmake
- src:
[default_build_paths] - source: ../../../modules/src.cmake
source: ../../../modules/default_build_paths.cmake
[src]
source: ../../../modules/src.cmake

View File

@ -123,34 +123,28 @@ 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')
@skip_always
def test_python_interpreter(): def test_python_interpreter():
configure_build_and_exe('python_interpreter', 'python setup --cxx=g++') configure_build_and_exe('python_interpreter', 'python setup --cxx=g++')
@skip_always
def test_python_interpreter_custom(): def test_python_interpreter_custom():
setup = 'python setup --cxx=g++ --python=%s' % sys.executable setup = 'python setup --cxx=g++ --python=%s' % sys.executable
configure_build_and_exe('python_interpreter_custom', setup) configure_build_and_exe('python_interpreter_custom', setup)
@skip_always
def test_python_libs(): def test_python_libs():
configure_build_and_exe('python_libs', 'python setup --cxx=g++') configure_build_and_exe('python_libs', 'python setup --cxx=g++')
@skip_always
def test_python_libs_custom(): def test_python_libs_custom():
python_executable = sys.executable python_executable = sys.executable
configure_build_and_exe('python_libs_custom', 'python setup --cxx=g++ --python={0}'.format(python_executable)) configure_build_and_exe('python_libs_custom', 'python setup --cxx=g++ --python={0}'.format(python_executable))
@skip_always
def test_boost_header_only(): def test_boost_header_only():
configure_build_and_exe('boost_header_only', 'python setup --cxx=g++') configure_build_and_exe('boost_header_only', 'python setup --cxx=g++')
@skip_always
@skip_on_osx @skip_on_osx
def test_boost_libs(): def test_boost_libs():
configure_build_and_exe('boost_libs', 'python setup --cxx=g++ --mpi') configure_build_and_exe('boost_libs', 'python setup --cxx=g++ --mpi')