From 28582ceba7ffe1dcf284bbd53118b87a74cf4865 Mon Sep 17 00:00:00 2001 From: Radovan Bast Date: Fri, 20 May 2016 15:37:22 +0200 Subject: [PATCH] reactivate test_cxx --- test/cxx/cmake/autocmake.yml | 17 +++++++---------- test/test.py | 1 - 2 files changed, 7 insertions(+), 11 deletions(-) diff --git a/test/cxx/cmake/autocmake.yml b/test/cxx/cmake/autocmake.yml index ce3bf11..5bfe461 100644 --- a/test/cxx/cmake/autocmake.yml +++ b/test/cxx/cmake/autocmake.yml @@ -1,12 +1,9 @@ -[project] name: example min_cmake_version: 2.8 - -[cxx] -source: ../../../modules/cxx.cmake - -[default_build_paths] -source: ../../../modules/default_build_paths.cmake - -[src] -source: ../../../modules/src.cmake +modules: +- cxx: + - source: ../../../modules/cxx.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 07f8ceb..4424596 100644 --- a/test/test.py +++ b/test/test.py @@ -89,7 +89,6 @@ def test_extra_cmake_options(): configure_build_and_exe('extra_cmake_options', 'python setup --cxx=g++ --cmake-options="-DENABLE_SOMETHING=OFF -DENABLE_FOO=ON"') -@skip_always def test_cxx(): configure_build_and_exe('cxx', 'python setup --cxx=g++')