From bfeef557e702c722a1e4bc98f67868f01dacf064 Mon Sep 17 00:00:00 2001 From: Radovan Bast Date: Fri, 20 May 2016 20:58:43 +0200 Subject: [PATCH] convert python tests to new form --- test/python_interpreter/cmake/autocmake.yml | 24 ++++++++--------- .../cmake/autocmake.yml | 22 +++++++-------- test/python_libs/cmake/autocmake.yml | 27 ++++++++----------- test/python_libs_custom/cmake/autocmake.yml | 27 ++++++++----------- test/test.py | 6 ----- 5 files changed, 42 insertions(+), 64 deletions(-) diff --git a/test/python_interpreter/cmake/autocmake.yml b/test/python_interpreter/cmake/autocmake.yml index d77d2cf..560fd7e 100644 --- a/test/python_interpreter/cmake/autocmake.yml +++ b/test/python_interpreter/cmake/autocmake.yml @@ -1,15 +1,13 @@ -[project] name: example min_cmake_version: 2.8 - -[cxx] -source: ../../../modules/cxx.cmake - -[python_interpreter] -source: ../../../modules/python_interpreter.cmake - -[default_build_paths] -source: ../../../modules/default_build_paths.cmake - -[src] -source: ../../../modules/src.cmake +modules: +- cxx: + - source: ../../../modules/cxx.cmake +- python_interpreter: + - source: ../../../modules/python_interpreter.cmake +- python_libs: + - source: ../../../modules/python_libs.cmake +- default_build_paths: + - source: ../../../modules/default_build_paths.cmake +- src: + - source: ../../../modules/src.cmake diff --git a/test/python_interpreter_custom/cmake/autocmake.yml b/test/python_interpreter_custom/cmake/autocmake.yml index d77d2cf..1bb701d 100644 --- a/test/python_interpreter_custom/cmake/autocmake.yml +++ b/test/python_interpreter_custom/cmake/autocmake.yml @@ -1,15 +1,11 @@ -[project] name: example min_cmake_version: 2.8 - -[cxx] -source: ../../../modules/cxx.cmake - -[python_interpreter] -source: ../../../modules/python_interpreter.cmake - -[default_build_paths] -source: ../../../modules/default_build_paths.cmake - -[src] -source: ../../../modules/src.cmake +modules: +- cxx: + - source: ../../../modules/cxx.cmake +- python_interpreter: + - source: ../../../modules/python_interpreter.cmake +- default_build_paths: + - source: ../../../modules/default_build_paths.cmake +- src: + - source: ../../../modules/src.cmake diff --git a/test/python_libs/cmake/autocmake.yml b/test/python_libs/cmake/autocmake.yml index df9c15d..560fd7e 100644 --- a/test/python_libs/cmake/autocmake.yml +++ b/test/python_libs/cmake/autocmake.yml @@ -1,18 +1,13 @@ -[project] name: example min_cmake_version: 2.8 - -[cxx] -source: ../../../modules/cxx.cmake - -[python_interpreter] -source: ../../../modules/python_interpreter.cmake - -[python_libs] -source: ../../../modules/python_libs.cmake - -[default_build_paths] -source: ../../../modules/default_build_paths.cmake - -[src] -source: ../../../modules/src.cmake +modules: +- cxx: + - source: ../../../modules/cxx.cmake +- python_interpreter: + - source: ../../../modules/python_interpreter.cmake +- python_libs: + - source: ../../../modules/python_libs.cmake +- default_build_paths: + - source: ../../../modules/default_build_paths.cmake +- src: + - source: ../../../modules/src.cmake diff --git a/test/python_libs_custom/cmake/autocmake.yml b/test/python_libs_custom/cmake/autocmake.yml index df9c15d..560fd7e 100644 --- a/test/python_libs_custom/cmake/autocmake.yml +++ b/test/python_libs_custom/cmake/autocmake.yml @@ -1,18 +1,13 @@ -[project] name: example min_cmake_version: 2.8 - -[cxx] -source: ../../../modules/cxx.cmake - -[python_interpreter] -source: ../../../modules/python_interpreter.cmake - -[python_libs] -source: ../../../modules/python_libs.cmake - -[default_build_paths] -source: ../../../modules/default_build_paths.cmake - -[src] -source: ../../../modules/src.cmake +modules: +- cxx: + - source: ../../../modules/cxx.cmake +- python_interpreter: + - source: ../../../modules/python_interpreter.cmake +- python_libs: + - source: ../../../modules/python_libs.cmake +- default_build_paths: + - source: ../../../modules/default_build_paths.cmake +- src: + - source: ../../../modules/src.cmake diff --git a/test/test.py b/test/test.py index b2c4562..d2a521a 100644 --- a/test/test.py +++ b/test/test.py @@ -123,34 +123,28 @@ def test_cxx_accelerate(): configure_build_and_exe('cxx_accelerate', 'python setup --cxx=g++ --accelerate') -@skip_always def test_python_interpreter(): configure_build_and_exe('python_interpreter', 'python setup --cxx=g++') -@skip_always def test_python_interpreter_custom(): setup = 'python setup --cxx=g++ --python=%s' % sys.executable configure_build_and_exe('python_interpreter_custom', setup) -@skip_always def test_python_libs(): configure_build_and_exe('python_libs', 'python setup --cxx=g++') -@skip_always def test_python_libs_custom(): python_executable = sys.executable configure_build_and_exe('python_libs_custom', 'python setup --cxx=g++ --python={0}'.format(python_executable)) -@skip_always def test_boost_header_only(): configure_build_and_exe('boost_header_only', 'python setup --cxx=g++') -@skip_always @skip_on_osx def test_boost_libs(): configure_build_and_exe('boost_libs', 'python setup --cxx=g++ --mpi')