From 0bf578eebad13ace25b6e4bf170a189520157250 Mon Sep 17 00:00:00 2001 From: Radovan Bast Date: Sat, 30 May 2015 20:19:06 +0200 Subject: [PATCH] restore test --- test/cxx/cmake/autocmake.cfg | 3 --- test/cxx/{cmake/custom/custom.cmake => src/CMakeLists.txt} | 0 test/cxx/{ => src}/example.cpp | 0 test/test.py | 2 +- 4 files changed, 1 insertion(+), 4 deletions(-) rename test/cxx/{cmake/custom/custom.cmake => src/CMakeLists.txt} (100%) rename test/cxx/{ => src}/example.cpp (100%) diff --git a/test/cxx/cmake/autocmake.cfg b/test/cxx/cmake/autocmake.cfg index 555eb80..eac4647 100644 --- a/test/cxx/cmake/autocmake.cfg +++ b/test/cxx/cmake/autocmake.cfg @@ -5,6 +5,3 @@ name: example source: https://github.com/scisoft/autocmake/raw/master/modules/UseCXX.cmake docopt: --cxx= C++ compiler [default: g++]. export: 'CXX=%s' % arguments['--cxx'] - -[custom] -source: custom/custom.cmake diff --git a/test/cxx/cmake/custom/custom.cmake b/test/cxx/src/CMakeLists.txt similarity index 100% rename from test/cxx/cmake/custom/custom.cmake rename to test/cxx/src/CMakeLists.txt diff --git a/test/cxx/example.cpp b/test/cxx/src/example.cpp similarity index 100% rename from test/cxx/example.cpp rename to test/cxx/src/example.cpp diff --git a/test/test.py b/test/test.py index 31cc086..3107519 100644 --- a/test/test.py +++ b/test/test.py @@ -22,5 +22,5 @@ def test_cxx(): stdout, stderr = exe('python setup.py --cxx=g++') os.chdir(os.path.join(HERE, 'cxx', 'build')) stdout, stderr = exe('make') - stdout, stderr = exe('./example') + stdout, stderr = exe('./bin/example') assert 'Hello World!' in stdout