reactivate one real test

.gitignore

@@ -7,7 +7,7 @@ __pycache__/
 test/*/CMakeLists.txt
 test/*/build*/
 test/*/cmake/update.py
-test/*/cmake/lib/
+test/*/cmake/autocmake/
 test/*/cmake/downloaded/
 test/*/setup
 

.travis.yml

@@ -51,7 +51,7 @@ script:
   - pep8 --ignore E501,E265 autocmake
 #   # unit tests
   - py.test -vv autocmake/*
-# - py.test -vv test/test.py
+  - py.test -vv test/test.py
 
 notifications:
   email: false

test/fc/cmake/autocmake.cfg

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

test/fc/cmake/autocmake.yml

@@ -0,0 +1,9 @@
+name: example
+min_cmake_version: 2.8
+modules:
+- fc:
+  - source: ../../../modules/fc.cmake
+- default_build_paths:
+  - source: ../../../modules/default_build_paths.cmake
+- src:
+  - source: ../../../modules/src.cmake

test/test.py

@@ -51,15 +51,7 @@ def configure_build_and_exe(name, setup_command, launcher=None):
     os.chdir(os.path.join(HERE, name, 'cmake'))
     shutil.copy(os.path.join('..', '..', '..', 'update.py'), 'update.py')
 
-    dst_dir = 'lib'
-    if not os.path.exists(dst_dir):
-        os.makedirs(dst_dir)
-    shutil.copy(os.path.join('..', '..', '..', dst_dir, 'config.py'), dst_dir)
-
-    dst_dir = os.path.join('lib', 'docopt')
-    if not os.path.exists(dst_dir):
-        os.makedirs(dst_dir)
-    shutil.copy(os.path.join('..', '..', '..', dst_dir, 'docopt.py'), dst_dir)
+    shutil.copytree(os.path.join('..', '..', '..', 'autocmake'), 'autocmake')
 
     stdout, stderr = exe('python update.py ..')
     os.chdir(os.path.join(HERE, name))
@@ -92,10 +84,12 @@ def configure_build_and_exe(name, setup_command, launcher=None):
 # ------------------------------------------------------------------------------
 
 
+@skip_always
 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++')
 
@@ -104,60 +98,73 @@ def test_fc():
     configure_build_and_exe('fc', 'python setup --fc=gfortran')
 
 
+@skip_always
 def test_fc_git_info():
     configure_build_and_exe('fc_git_info', 'python setup --fc=gfortran')
 
 
+@skip_always
 def test_fc_int64():
     configure_build_and_exe('fc_int64', 'python setup --fc=gfortran --int64')
 
 
+@skip_always
 @skip_on_osx
 def test_fc_omp():
     os.environ['OMP_NUM_THREADS'] = '2'
     configure_build_and_exe('fc_omp', 'python setup --omp --fc=gfortran')
 
 
+@skip_always
 def test_fc_blas():
     configure_build_and_exe('fc_blas', 'python setup --fc=gfortran --blas')
 
 
+@skip_always
 def test_fc_lapack():
     configure_build_and_exe('fc_lapack', 'python setup --fc=gfortran --lapack')
 
 
+@skip_always
 @skip_on_osx
 def test_cxx_cblas():
     configure_build_and_exe('cxx_cblas', 'python setup --cxx=g++ --cblas')
 
 
+@skip_always
 @skip_on_linux
 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')