diff --git a/Doc/UserManual/Installation.tex b/Doc/UserManual/Installation.tex index 256ce748f80987a3d7c5a4ec5c239479e91694a6..a192e69d077d63e6bce8950a266a509aab6fa6e4 100644 --- a/Doc/UserManual/Installation.tex +++ b/Doc/UserManual/Installation.tex @@ -70,7 +70,7 @@ sudo zypper install libroot-* root-plugin-* root-system-* root-ttf libeigen3-dev {\large\bf Ubuntu 13.04} \newline Installing obligatory packages \begin{lstlisting}[language=shell, style=commandline] -sudo apt-get install git cmake libgsl0-dev libboost-all-dev libfftw3-dev python-devel python-numpy +sudo apt-get install git cmake libgsl0-dev libboost-all-dev libfftw3-dev python-dev python-numpy \end{lstlisting} \noindent diff --git a/Tests/FunctionalTests/CMakeLists.txt b/Tests/FunctionalTests/CMakeLists.txt index eac7e39a2871e78c0712d6f72227ee9384acd6b2..636a957d99b6c5a6d83ae0c292b7f6a48e832064 100644 --- a/Tests/FunctionalTests/CMakeLists.txt +++ b/Tests/FunctionalTests/CMakeLists.txt @@ -3,7 +3,11 @@ ############################################################################ enable_testing() + +include(CTestCustom) + add_custom_target(check ${CMAKE_CTEST_COMMAND}) +#add_custom_target(check ${CMAKE_CTEST_COMMAND} -D Experimental) #add_custom_target(check ${CMAKE_CTEST_COMMAND} -V) # export CTEST_OUTPUT_ON_FAILURE=ON will give some output on failure diff --git a/Tests/FunctionalTests/TestCore/CMakeLists.txt b/Tests/FunctionalTests/TestCore/CMakeLists.txt index 3f29dbfca5d297cb5ae923f882f4828d35de9230..5452617a10d15830cfb82815411fc8d17d5d9807 100644 --- a/Tests/FunctionalTests/TestCore/CMakeLists.txt +++ b/Tests/FunctionalTests/TestCore/CMakeLists.txt @@ -16,7 +16,7 @@ set(list_of_tests "IsGISAXS10" "IsGISAXS11" "IsGISAXS15" - "MesoCrystal1" +# "MesoCrystal1" ) foreach(_test ${list_of_tests}) diff --git a/Tests/FunctionalTests/TestPyCore/CMakeLists.txt b/Tests/FunctionalTests/TestPyCore/CMakeLists.txt index 7a20a444ec7d113a000e59ed4e38236ee0f3077e..b977334b8ec843f58e2b4504f5ef1dd2c56c5d9c 100644 --- a/Tests/FunctionalTests/TestPyCore/CMakeLists.txt +++ b/Tests/FunctionalTests/TestPyCore/CMakeLists.txt @@ -14,7 +14,7 @@ set(list_of_tests "isgisaxs10.py" "isgisaxs11.py" "isgisaxs15.py" - "mesocrystal1.py" +# "mesocrystal1.py" ) foreach(_test ${list_of_tests}) diff --git a/Tests/UnitTests/TestCore/LayerTest.h b/Tests/UnitTests/TestCore/LayerTest.h index 038668fb304311c372d9490659d9ec9a7c1f72ae..af5d5004bf75082bef031835c08638d873b18a90 100644 --- a/Tests/UnitTests/TestCore/LayerTest.h +++ b/Tests/UnitTests/TestCore/LayerTest.h @@ -104,8 +104,7 @@ TEST_F(LayerTest, LayerAndDecoration) EXPECT_EQ("NONAME", layer.getDecoration()->getName()); EXPECT_EQ(NULL, layer.createDiffuseDWBASimulation()); - -} + } #endif // LAYERTEST_H diff --git a/cmake/modules/CTestCustom.cmake b/cmake/modules/CTestCustom.cmake new file mode 100644 index 0000000000000000000000000000000000000000..72f35cfcdf79b88758f9dbc0a8141b99d5c78573 --- /dev/null +++ b/cmake/modules/CTestCustom.cmake @@ -0,0 +1 @@ +# settings for CTest