Conditionally disable unit tests that are not supported by evaluators yet

1 files changed, 35 insertions, 31 deletions

diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
index e1bff179d..83cdb40b6 100644
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -129,7 +129,6 @@ add_custom_target(BuildOfficial)
 option(EIGEN_TEST_EVALUATORS "Enable work in progress evaluators" OFF)
 if(EIGEN_TEST_EVALUATORS)
   add_definitions("-DEIGEN_TEST_EVALUATORS=1")
-  add_definitions("-DEIGEN_ENABLE_EVALUATORS=1")
 endif(EIGEN_TEST_EVALUATORS)
 
 ei_add_test(meta)
@@ -137,6 +136,7 @@ ei_add_test(sizeof)
 ei_add_test(dynalloc)
 ei_add_test(nomalloc)
 ei_add_test(first_aligned)
+ei_add_test(nullary)
 ei_add_test(mixingtypes)
 ei_add_test(packetmath)
 ei_add_test(unalignedassert)
@@ -144,13 +144,15 @@ ei_add_test(vectorization_logic)
 ei_add_test(basicstuff)
 ei_add_test(linearstructure)
 ei_add_test(integer_types)
-ei_add_test(cwiseop)
 ei_add_test(unalignedcount)
 ei_add_test(exceptions)
 ei_add_test(redux)
 ei_add_test(visitor)
 ei_add_test(block)
 ei_add_test(corners)
+ei_add_test(swap)
+ei_add_test(resize)
+ei_add_test(conservative_resize)
 ei_add_test(product_small)
 ei_add_test(product_large)
 ei_add_test(product_extra)
@@ -179,6 +181,7 @@ ei_add_test(product_trsolve)
 ei_add_test(product_mmtr)
 ei_add_test(product_notemporary)
 ei_add_test(stable_norm)
+ei_add_test(permutationmatrices)
 ei_add_test(bandmatrix)
 ei_add_test(cholesky)
 ei_add_test(lu)
@@ -198,30 +201,33 @@ ei_add_test(real_qz)
 ei_add_test(eigensolver_generalized_real)
 ei_add_test(jacobi)
 ei_add_test(jacobisvd)
-ei_add_test(geo_orthomethods)
-ei_add_test(geo_homogeneous)
-ei_add_test(geo_quaternion)
-ei_add_test(geo_transformations)
-ei_add_test(geo_eulerangles)
-ei_add_test(geo_hyperplane)
-ei_add_test(geo_parametrizedline)
-ei_add_test(geo_alignedbox)
-ei_add_test(stdvector)
-ei_add_test(stdvector_overload)
-ei_add_test(stdlist)
-ei_add_test(stddeque)
-ei_add_test(resize)
-ei_add_test(sparse_vector)
-ei_add_test(sparse_basic)
-ei_add_test(sparse_product)
-ei_add_test(sparse_solvers)
-ei_add_test(umeyama)
 ei_add_test(householder)
-ei_add_test(swap)
-ei_add_test(conservative_resize)
-ei_add_test(permutationmatrices)
-ei_add_test(sparse_permutations)
-ei_add_test(nullary)
+if(NOT EIGEN_TEST_EVALUATORS)
+  ei_add_test(cwiseop) # Eigen2 related
+  ei_add_test(geo_orthomethods)
+  ei_add_test(geo_homogeneous)
+  ei_add_test(geo_quaternion)
+  ei_add_test(geo_transformations)
+  ei_add_test(geo_eulerangles)
+  ei_add_test(geo_hyperplane)
+  ei_add_test(geo_parametrizedline)
+  ei_add_test(geo_alignedbox)
+  ei_add_test(stdvector)
+  ei_add_test(stdvector_overload)
+  ei_add_test(stdlist)
+  ei_add_test(stddeque)
+  ei_add_test(sparse_vector)
+  ei_add_test(sparse_basic)
+  ei_add_test(sparse_product)
+  ei_add_test(sparse_solvers)
+  ei_add_test(sparse_permutations)
+  ei_add_test(simplicial_cholesky)
+  ei_add_test(conjugate_gradient)
+  ei_add_test(bicgstab)
+  ei_add_test(sparselu)
+  ei_add_test(sparseqr)
+endif(NOT EIGEN_TEST_EVALUATORS)
+ei_add_test(umeyama)
 ei_add_test(nesting_ops "${CMAKE_CXX_FLAGS_DEBUG}")
 ei_add_test(zerosized)
 ei_add_test(dontalign)
@@ -233,13 +239,9 @@ ei_add_test(special_numbers)
 ei_add_test(rvalue_types)
 ei_add_test(dense_storage)
 
-ei_add_test(simplicial_cholesky)
-ei_add_test(conjugate_gradient)
-ei_add_test(bicgstab)
-ei_add_test(sparselu)
-ei_add_test(sparseqr)
+# # ei_add_test(denseLM)
 
-# ei_add_test(denseLM)
+if(NOT EIGEN_TEST_EVALUATORS)
 
 if(QT4_FOUND)
   ei_add_test(qtvector "" "${QT_QTCORE_LIBRARY}")
@@ -275,6 +277,8 @@ if(METIS_FOUND)
 ei_add_test(metis_support "" "${METIS_LIBRARIES}")
 endif()
 
+endif(NOT EIGEN_TEST_EVALUATORS)
+
 string(TOLOWER "${CMAKE_CXX_COMPILER}" cmake_cxx_compiler_tolower)
 if(cmake_cxx_compiler_tolower MATCHES "qcc")
   set(CXX_IS_QCC "ON")