From f63de005dac2284b3779f66f0b40ce709e8d2036 Mon Sep 17 00:00:00 2001
From: Gennady Pospelov <g.pospelov@fz-juelich.de>
Date: Fri, 26 Jul 2013 13:37:03 +0200
Subject: [PATCH] Removed mesocrystal tests from CTest
---
Doc/UserManual/Installation.tex | 2 +-
Tests/FunctionalTests/CMakeLists.txt | 4 ++++
Tests/FunctionalTests/TestCore/CMakeLists.txt | 2 +-
Tests/FunctionalTests/TestPyCore/CMakeLists.txt | 2 +-
Tests/UnitTests/TestCore/LayerTest.h | 3 +--
cmake/modules/CTestCustom.cmake | 1 +
6 files changed, 9 insertions(+), 5 deletions(-)
create mode 100644 cmake/modules/CTestCustom.cmake
diff --git a/Doc/UserManual/Installation.tex b/Doc/UserManual/Installation.tex
index 256ce748f80..a192e69d077 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 eac7e39a287..636a957d99b 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 3f29dbfca5d..5452617a10d 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 7a20a444ec7..b977334b8ec 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 038668fb304..af5d5004bf7 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 00000000000..72f35cfcdf7
--- /dev/null
+++ b/cmake/modules/CTestCustom.cmake
@@ -0,0 +1 @@
+# settings for CTest
--
GitLab