aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorGravatar Benoit Jacob <jacob.benoit.1@gmail.com>2009-11-12 15:02:52 -0500
committerGravatar Benoit Jacob <jacob.benoit.1@gmail.com>2009-11-12 15:02:52 -0500
commit9b7708f6603555fa1f960d8f8ae30a3d613b478a (patch)
treea307c8e886a1d11a927c89c55a086e962e97e546
parent8b563d7163d2e452468b8fdcec4900ecb2853213 (diff)
introduce check target, and some renaming
-rw-r--r--cmake/EigenTesting.cmake2
-rw-r--r--scripts/CMakeLists.txt2
-rwxr-xr-xscripts/check.in (renamed from scripts/mctestr.in)0
-rw-r--r--test/CMakeLists.txt8
-rwxr-xr-xtest/buildtests.in (renamed from test/maketests.in)0
-rw-r--r--test/mixingtypes.cpp3
6 files changed, 11 insertions, 4 deletions
diff --git a/cmake/EigenTesting.cmake b/cmake/EigenTesting.cmake
index 8ed39738d..42f7454f4 100644
--- a/cmake/EigenTesting.cmake
+++ b/cmake/EigenTesting.cmake
@@ -23,7 +23,7 @@ macro(ei_add_test_internal testname testname_with_suffix)
set(filename ${testname}.cpp)
add_executable(${targetname} ${filename})
- add_dependencies(btest ${targetname})
+ add_dependencies(buildtests ${targetname})
if(EIGEN_NO_ASSERTION_CHECKING)
ei_add_target_property(${targetname} COMPILE_FLAGS "-DEIGEN_NO_ASSERTION_CHECKING=1")
diff --git a/scripts/CMakeLists.txt b/scripts/CMakeLists.txt
index 2d40e32ae..b75e99d5e 100644
--- a/scripts/CMakeLists.txt
+++ b/scripts/CMakeLists.txt
@@ -1,3 +1,3 @@
-configure_file(mctestr.in ${CMAKE_BINARY_DIR}/mctestr)
+configure_file(check.in ${CMAKE_BINARY_DIR}/check)
configure_file(debug.in ${CMAKE_BINARY_DIR}/debug)
configure_file(release.in ${CMAKE_BINARY_DIR}/release)
diff --git a/scripts/mctestr.in b/scripts/check.in
index a388ef38f..a388ef38f 100755
--- a/scripts/mctestr.in
+++ b/scripts/check.in
diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
index 5cea1a582..b074c8842 100644
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -1,5 +1,9 @@
project(EigenTesting)
-add_custom_target(btest)
+add_custom_target(buildtests)
+add_custom_target(check COMMAND "ctest")
+add_dependencies(check buildtests)
+
+
include(EigenTesting)
ei_init_testing()
@@ -163,4 +167,4 @@ endif(CMAKE_COMPILER_IS_GNUCXX)
ei_add_property(EIGEN_TESTING_SUMMARY "CXX_FLAGS: ${CMAKE_CXX_FLAGS}\n")
ei_add_property(EIGEN_TESTING_SUMMARY "Sparse lib flags: ${SPARSE_LIBS}\n")
-configure_file(maketests.in ${CMAKE_BINARY_DIR}/maketests)
+configure_file(buildtests.in ${CMAKE_BINARY_DIR}/buildtests)
diff --git a/test/maketests.in b/test/buildtests.in
index f9cafed26..f9cafed26 100755
--- a/test/maketests.in
+++ b/test/buildtests.in
diff --git a/test/mixingtypes.cpp b/test/mixingtypes.cpp
index 1dcd77a8a..71c2dcb18 100644
--- a/test/mixingtypes.cpp
+++ b/test/mixingtypes.cpp
@@ -23,6 +23,9 @@
// License and a copy of the GNU General Public License along with
// Eigen. If not, see <http://www.gnu.org/licenses/>.
+// work around "uninitialized" warnings and give that option some testing
+#define EIGEN_INITIALIZE_MATRICES_BY_ZERO
+
#ifndef EIGEN_NO_STATIC_ASSERT
#define EIGEN_NO_STATIC_ASSERT // turn static asserts into runtime asserts in order to check them
#endif