From 8acd43bbdbdcf24a98fff86499599a0ac971bc37 Mon Sep 17 00:00:00 2001
From: Benoit Jacob <jacob.benoit.1@gmail.com>
Date: Tue, 25 Jan 2011 08:37:18 -0500
Subject: [PATCH] let eigen2 tests use the same ei_add_test macro, which
 required to prefix them with eigen2_ ; rename buildtests_eigen2 to
 eigen2_buildtests, etc.

---
 cmake/EigenTesting.cmake                      |   6 +-
 test/eigen2/CMakeLists.txt                    | 174 +++++-------------
 .../{adjoint.cpp => eigen2_adjoint.cpp}       |   2 +-
 .../{alignedbox.cpp => eigen2_alignedbox.cpp} |   2 +-
 test/eigen2/{array.cpp => eigen2_array.cpp}   |   2 +-
 .../{basicstuff.cpp => eigen2_basicstuff.cpp} |   2 +-
 .../{bug_132.cpp => eigen2_bug_132.cpp}       |   2 +-
 .../{cholesky.cpp => eigen2_cholesky.cpp}     |   2 +-
 ...alizer.cpp => eigen2_commainitializer.cpp} |   2 +-
 .../{cwiseop.cpp => eigen2_cwiseop.cpp}       |   2 +-
 ...determinant.cpp => eigen2_determinant.cpp} |   2 +-
 .../{dynalloc.cpp => eigen2_dynalloc.cpp}     |   2 +-
 ...eigensolver.cpp => eigen2_eigensolver.cpp} |   2 +-
 ...t_aligned.cpp => eigen2_first_aligned.cpp} |   6 +-
 .../{geometry.cpp => eigen2_geometry.cpp}     |   2 +-
 .../{hyperplane.cpp => eigen2_hyperplane.cpp} |   2 +-
 .../{inverse.cpp => eigen2_inverse.cpp}       |   2 +-
 ...ructure.cpp => eigen2_linearstructure.cpp} |   2 +-
 test/eigen2/{lu.cpp => eigen2_lu.cpp}         |   2 +-
 test/eigen2/{map.cpp => eigen2_map.cpp}       |   2 +-
 test/eigen2/{meta.cpp => eigen2_meta.cpp}     |   2 +-
 ...scmatrices.cpp => eigen2_miscmatrices.cpp} |   2 +-
 ...mixingtypes.cpp => eigen2_mixingtypes.cpp} |   2 +-
 ...wstdvector.cpp => eigen2_newstdvector.cpp} |   2 +-
 .../{nomalloc.cpp => eigen2_nomalloc.cpp}     |   2 +-
 .../{packetmath.cpp => eigen2_packetmath.cpp} |   2 +-
 ...edline.cpp => eigen2_parametrizedline.cpp} |   2 +-
 ...se_4x4.cpp => eigen2_prec_inverse_4x4.cpp} |   2 +-
 ...uct_large.cpp => eigen2_product_large.cpp} |   2 +-
 ...uct_small.cpp => eigen2_product_small.cpp} |   2 +-
 test/eigen2/{qr.cpp => eigen2_qr.cpp}         |   2 +-
 .../{qtvector.cpp => eigen2_qtvector.cpp}     |   2 +-
 .../{regression.cpp => eigen2_regression.cpp} |   2 +-
 test/eigen2/{sizeof.cpp => eigen2_sizeof.cpp} |   2 +-
 ...allvectors.cpp => eigen2_smallvectors.cpp} |   2 +-
 ...arse_basic.cpp => eigen2_sparse_basic.cpp} |   2 +-
 ..._product.cpp => eigen2_sparse_product.cpp} |   2 +-
 ..._solvers.cpp => eigen2_sparse_solvers.cpp} |   2 +-
 ...se_vector.cpp => eigen2_sparse_vector.cpp} |   2 +-
 .../{stdvector.cpp => eigen2_stdvector.cpp}   |   2 +-
 ...submatrices.cpp => eigen2_submatrices.cpp} |   2 +-
 test/eigen2/{sum.cpp => eigen2_sum.cpp}       |   2 +-
 test/eigen2/{svd.cpp => eigen2_svd.cpp}       |   2 +-
 test/eigen2/{swap.cpp => eigen2_swap.cpp}     |   2 +-
 .../{triangular.cpp => eigen2_triangular.cpp} |   2 +-
 ...dassert.cpp => eigen2_unalignedassert.cpp} |   2 +-
 .../{visitor.cpp => eigen2_visitor.cpp}       |   2 +-
 47 files changed, 102 insertions(+), 172 deletions(-)
 rename test/eigen2/{adjoint.cpp => eigen2_adjoint.cpp} (99%)
 rename test/eigen2/{alignedbox.cpp => eigen2_alignedbox.cpp} (98%)
 rename test/eigen2/{array.cpp => eigen2_array.cpp} (99%)
 rename test/eigen2/{basicstuff.cpp => eigen2_basicstuff.cpp} (99%)
 rename test/eigen2/{bug_132.cpp => eigen2_bug_132.cpp} (98%)
 rename test/eigen2/{cholesky.cpp => eigen2_cholesky.cpp} (99%)
 rename test/eigen2/{commainitializer.cpp => eigen2_commainitializer.cpp} (98%)
 rename test/eigen2/{cwiseop.cpp => eigen2_cwiseop.cpp} (99%)
 rename test/eigen2/{determinant.cpp => eigen2_determinant.cpp} (98%)
 rename test/eigen2/{dynalloc.cpp => eigen2_dynalloc.cpp} (99%)
 rename test/eigen2/{eigensolver.cpp => eigen2_eigensolver.cpp} (99%)
 rename test/eigen2/{first_aligned.cpp => eigen2_first_aligned.cpp} (93%)
 rename test/eigen2/{geometry.cpp => eigen2_geometry.cpp} (99%)
 rename test/eigen2/{hyperplane.cpp => eigen2_hyperplane.cpp} (99%)
 rename test/eigen2/{inverse.cpp => eigen2_inverse.cpp} (99%)
 rename test/eigen2/{linearstructure.cpp => eigen2_linearstructure.cpp} (99%)
 rename test/eigen2/{lu.cpp => eigen2_lu.cpp} (99%)
 rename test/eigen2/{map.cpp => eigen2_map.cpp} (99%)
 rename test/eigen2/{meta.cpp => eigen2_meta.cpp} (99%)
 rename test/eigen2/{miscmatrices.cpp => eigen2_miscmatrices.cpp} (98%)
 rename test/eigen2/{mixingtypes.cpp => eigen2_mixingtypes.cpp} (99%)
 rename test/eigen2/{newstdvector.cpp => eigen2_newstdvector.cpp} (99%)
 rename test/eigen2/{nomalloc.cpp => eigen2_nomalloc.cpp} (99%)
 rename test/eigen2/{packetmath.cpp => eigen2_packetmath.cpp} (99%)
 rename test/eigen2/{parametrizedline.cpp => eigen2_parametrizedline.cpp} (98%)
 rename test/eigen2/{prec_inverse_4x4.cpp => eigen2_prec_inverse_4x4.cpp} (99%)
 rename test/eigen2/{product_large.cpp => eigen2_product_large.cpp} (98%)
 rename test/eigen2/{product_small.cpp => eigen2_product_small.cpp} (97%)
 rename test/eigen2/{qr.cpp => eigen2_qr.cpp} (99%)
 rename test/eigen2/{qtvector.cpp => eigen2_qtvector.cpp} (99%)
 rename test/eigen2/{regression.cpp => eigen2_regression.cpp} (99%)
 rename test/eigen2/{sizeof.cpp => eigen2_sizeof.cpp} (98%)
 rename test/eigen2/{smallvectors.cpp => eigen2_smallvectors.cpp} (98%)
 rename test/eigen2/{sparse_basic.cpp => eigen2_sparse_basic.cpp} (99%)
 rename test/eigen2/{sparse_product.cpp => eigen2_sparse_product.cpp} (99%)
 rename test/eigen2/{sparse_solvers.cpp => eigen2_sparse_solvers.cpp} (99%)
 rename test/eigen2/{sparse_vector.cpp => eigen2_sparse_vector.cpp} (99%)
 rename test/eigen2/{stdvector.cpp => eigen2_stdvector.cpp} (99%)
 rename test/eigen2/{submatrices.cpp => eigen2_submatrices.cpp} (99%)
 rename test/eigen2/{sum.cpp => eigen2_sum.cpp} (99%)
 rename test/eigen2/{svd.cpp => eigen2_svd.cpp} (99%)
 rename test/eigen2/{swap.cpp => eigen2_swap.cpp} (99%)
 rename test/eigen2/{triangular.cpp => eigen2_triangular.cpp} (99%)
 rename test/eigen2/{unalignedassert.cpp => eigen2_unalignedassert.cpp} (98%)
 rename test/eigen2/{visitor.cpp => eigen2_visitor.cpp} (99%)

diff --git a/cmake/EigenTesting.cmake b/cmake/EigenTesting.cmake
index e25b5e9da..f3dabfe6f 100644
--- a/cmake/EigenTesting.cmake
+++ b/cmake/EigenTesting.cmake
@@ -12,7 +12,11 @@ macro(ei_add_test_internal testname testname_with_suffix)
 
   set(filename ${testname}.cpp)
   add_executable(${targetname} ${filename})
-  add_dependencies(buildtests ${targetname})
+  if (targetname MATCHES "^eigen2_")
+    add_dependencies(eigen2_buildtests ${targetname})
+  else()
+    add_dependencies(buildtests ${targetname})
+  endif()
 
   if(EIGEN_NO_ASSERTION_CHECKING)
     ei_add_target_property(${targetname} COMPILE_FLAGS "-DEIGEN_NO_ASSERTION_CHECKING=1")
diff --git a/test/eigen2/CMakeLists.txt b/test/eigen2/CMakeLists.txt
index 9b128396f..16a0151bb 100644
--- a/test/eigen2/CMakeLists.txt
+++ b/test/eigen2/CMakeLists.txt
@@ -1,132 +1,58 @@
-add_custom_target(buildtests_eigen2)
-add_custom_target(check_eigen2 COMMAND "ctest")
-add_dependencies(check_eigen2 buildtests_eigen2)
+add_custom_target(eigen2_buildtests)
+add_custom_target(eigen2_check COMMAND "ctest -R eigen2")
+add_dependencies(eigen2_check eigen2_buildtests)
+add_dependencies(buildtests eigen2_buildtests)
 
 add_definitions("-DEIGEN2_SUPPORT_STAGE10_FULL_EIGEN2_API")
 
-# Macro to add a test
-#
-# the unique parameter testname must correspond to a file
-# <testname>.cpp which follows this pattern:
-#
-# #include "main.h"
-# void test_<testname>() { ... }
-#
-# this macro add an executable test_<testname> as well as a ctest test
-# named <testname>
-#
-# On platforms with bash simply run:
-#   "ctest -V" or "ctest -V -R <testname>"
-# On other platform use ctest as usual
-#
-macro(ei_add_test_eigen2 testname)
-
-  set(targetname test_eigen2_${testname})
-
-  set(filename ${testname}.cpp)
-  add_executable(${targetname} ${filename})
-  add_dependencies(buildtests_eigen2 ${targetname})
-
-  if(NOT EIGEN_NO_ASSERTION_CHECKING)
-
-    if(MSVC)
-      set_target_properties(${targetname} PROPERTIES COMPILE_FLAGS "/EHsc")
-    else(MSVC)
-      set_target_properties(${targetname} PROPERTIES COMPILE_FLAGS "-fexceptions")
-    endif(MSVC)
-
-    option(EIGEN_DEBUG_ASSERTS "Enable debuging of assertions" OFF)
-    if(EIGEN_DEBUG_ASSERTS)
-      set_target_properties(${targetname} PROPERTIES COMPILE_DEFINITIONS "EIGEN_DEBUG_ASSERTS=1")
-    endif(EIGEN_DEBUG_ASSERTS)
-
-  endif(NOT EIGEN_NO_ASSERTION_CHECKING)
-
-  if(${ARGC} GREATER 1)
-    ei_add_target_property(${targetname} COMPILE_FLAGS "${ARGV1}")
-  endif(${ARGC} GREATER 1)
-
-  ei_add_target_property(${targetname} COMPILE_FLAGS "-DEIGEN_TEST_FUNC=${testname}")
-
-  if(TEST_LIB)
-    target_link_libraries(${targetname} Eigen2)
-  endif(TEST_LIB)
-
-  if(EIGEN_STANDARD_LIBRARIES_TO_LINK_TO)
-    target_link_libraries(${targetname} ${EIGEN_STANDARD_LIBRARIES_TO_LINK_TO})
-  endif()
-
-  target_link_libraries(${targetname} ${EXTERNAL_LIBS})
-  if(${ARGC} GREATER 2)
-    string(STRIP "${ARGV2}" ARGV2_stripped)
-    string(LENGTH "${ARGV2_stripped}" ARGV2_stripped_length)
-    if(${ARGV2_stripped_length} GREATER 0)
-      target_link_libraries(${targetname} ${ARGV2})
-    endif(${ARGV2_stripped_length} GREATER 0)
-  endif(${ARGC} GREATER 2)
-
-  if(WIN32)
-    add_test(${testname} "${targetname}")
-  else(WIN32)
-    add_test(${testname} "${CMAKE_CURRENT_SOURCE_DIR}/runtest.sh" "${testname}")
-  endif(WIN32)
-
-endmacro(ei_add_test_eigen2)
-
-enable_testing()
-
-if(TEST_LIB)
-  add_definitions("-DEIGEN_EXTERN_INSTANTIATIONS=1")
-endif(TEST_LIB)
-
-ei_add_test_eigen2(meta)
-ei_add_test_eigen2(sizeof)
-ei_add_test_eigen2(dynalloc)
-ei_add_test_eigen2(nomalloc)
-ei_add_test_eigen2(first_aligned)
-ei_add_test_eigen2(mixingtypes)
-ei_add_test_eigen2(packetmath)
-ei_add_test_eigen2(unalignedassert)
-#ei_add_test_eigen2(vectorization_logic)
-ei_add_test_eigen2(basicstuff)
-ei_add_test_eigen2(linearstructure)
-ei_add_test_eigen2(cwiseop)
-ei_add_test_eigen2(sum)
-ei_add_test_eigen2(product_small)
-ei_add_test_eigen2(product_large ${EI_OFLAG})
-ei_add_test_eigen2(adjoint)
-ei_add_test_eigen2(submatrices)
-ei_add_test_eigen2(miscmatrices)
-ei_add_test_eigen2(commainitializer)
-ei_add_test_eigen2(smallvectors)
-ei_add_test_eigen2(map)
-ei_add_test_eigen2(array)
-ei_add_test_eigen2(triangular)
-ei_add_test_eigen2(cholesky " " "${GSL_LIBRARIES}")
-ei_add_test_eigen2(lu ${EI_OFLAG})
-ei_add_test_eigen2(determinant ${EI_OFLAG})
-ei_add_test_eigen2(inverse)
-ei_add_test_eigen2(qr)
-ei_add_test_eigen2(eigensolver " " "${GSL_LIBRARIES}")
-ei_add_test_eigen2(svd)
-ei_add_test_eigen2(geometry)
-ei_add_test_eigen2(hyperplane)
-ei_add_test_eigen2(parametrizedline)
-ei_add_test_eigen2(alignedbox)
-ei_add_test_eigen2(regression)
-ei_add_test_eigen2(stdvector)
-ei_add_test_eigen2(newstdvector)
+ei_add_test(eigen2_meta)
+ei_add_test(eigen2_sizeof)
+ei_add_test(eigen2_dynalloc)
+ei_add_test(eigen2_nomalloc)
+ei_add_test(eigen2_first_aligned)
+ei_add_test(eigen2_mixingtypes)
+ei_add_test(eigen2_packetmath)
+ei_add_test(eigen2_unalignedassert)
+#ei_add_test(eigen2_vectorization_logic)
+ei_add_test(eigen2_basicstuff)
+ei_add_test(eigen2_linearstructure)
+ei_add_test(eigen2_cwiseop)
+ei_add_test(eigen2_sum)
+ei_add_test(eigen2_product_small)
+ei_add_test(eigen2_product_large ${EI_OFLAG})
+ei_add_test(eigen2_adjoint)
+ei_add_test(eigen2_submatrices)
+ei_add_test(eigen2_miscmatrices)
+ei_add_test(eigen2_commainitializer)
+ei_add_test(eigen2_smallvectors)
+ei_add_test(eigen2_map)
+ei_add_test(eigen2_array)
+ei_add_test(eigen2_triangular)
+ei_add_test(eigen2_cholesky " " "${GSL_LIBRARIES}")
+ei_add_test(eigen2_lu ${EI_OFLAG})
+ei_add_test(eigen2_determinant ${EI_OFLAG})
+ei_add_test(eigen2_inverse)
+ei_add_test(eigen2_qr)
+ei_add_test(eigen2_eigensolver " " "${GSL_LIBRARIES}")
+ei_add_test(eigen2_svd)
+ei_add_test(eigen2_geometry)
+ei_add_test(eigen2_hyperplane)
+ei_add_test(eigen2_parametrizedline)
+ei_add_test(eigen2_alignedbox)
+ei_add_test(eigen2_regression)
+ei_add_test(eigen2_stdvector)
+ei_add_test(eigen2_newstdvector)
 if(QT4_FOUND)
-  ei_add_test_eigen2(qtvector " " "${QT_QTCORE_LIBRARY}")
+  ei_add_test(eigen2_qtvector " " "${QT_QTCORE_LIBRARY}")
 endif(QT4_FOUND)
 if(NOT EIGEN_DEFAULT_TO_ROW_MAJOR)
-  ei_add_test_eigen2(sparse_vector)
-  ei_add_test_eigen2(sparse_basic)
-  ei_add_test_eigen2(sparse_solvers " " "${SPARSE_LIBS}")
-  ei_add_test_eigen2(sparse_product)
+  ei_add_test(eigen2_sparse_vector)
+  ei_add_test(eigen2_sparse_basic)
+  ei_add_test(eigen2_sparse_solvers " " "${SPARSE_LIBS}")
+  ei_add_test(eigen2_sparse_product)
 endif()
-ei_add_test_eigen2(swap)
-ei_add_test_eigen2(visitor)
-ei_add_test_eigen2(bug_132)
+ei_add_test(eigen2_swap)
+ei_add_test(eigen2_visitor)
+ei_add_test(eigen2_bug_132)
 
-ei_add_test_eigen2(prec_inverse_4x4 ${EI_OFLAG})
+ei_add_test(eigen2_prec_inverse_4x4 ${EI_OFLAG})
diff --git a/test/eigen2/adjoint.cpp b/test/eigen2/eigen2_adjoint.cpp
similarity index 99%
rename from test/eigen2/adjoint.cpp
rename to test/eigen2/eigen2_adjoint.cpp
index f553bad02..50b9e2bf6 100644
--- a/test/eigen2/adjoint.cpp
+++ b/test/eigen2/eigen2_adjoint.cpp
@@ -100,7 +100,7 @@ template<typename MatrixType> void adjoint(const MatrixType& m)
   
 }
 
-void test_adjoint()
+void test_eigen2_adjoint()
 {
   for(int i = 0; i < g_repeat; i++) {
     CALL_SUBTEST( adjoint(Matrix<float, 1, 1>()) );
diff --git a/test/eigen2/alignedbox.cpp b/test/eigen2/eigen2_alignedbox.cpp
similarity index 98%
rename from test/eigen2/alignedbox.cpp
rename to test/eigen2/eigen2_alignedbox.cpp
index 53d61b62d..5d787184e 100644
--- a/test/eigen2/alignedbox.cpp
+++ b/test/eigen2/eigen2_alignedbox.cpp
@@ -65,7 +65,7 @@ template<typename BoxType> void alignedbox(const BoxType& _box)
   VERIFY_IS_APPROX(hp1d.template cast<Scalar>(),b0);
 }
 
-void test_alignedbox()
+void test_eigen2_alignedbox()
 {
   for(int i = 0; i < g_repeat; i++) {
     CALL_SUBTEST( alignedbox(AlignedBox<float,2>()) );
diff --git a/test/eigen2/array.cpp b/test/eigen2/eigen2_array.cpp
similarity index 99%
rename from test/eigen2/array.cpp
rename to test/eigen2/eigen2_array.cpp
index 2ea5ebd65..07aa07456 100644
--- a/test/eigen2/array.cpp
+++ b/test/eigen2/eigen2_array.cpp
@@ -129,7 +129,7 @@ template<typename VectorType> void lpNorm(const VectorType& v)
   VERIFY_IS_APPROX(ei_pow(u.template lpNorm<5>(), typename VectorType::RealScalar(5)), u.cwise().abs().cwise().pow(5).sum());
 }
 
-void test_array()
+void test_eigen2_array()
 {
   for(int i = 0; i < g_repeat; i++) {
     CALL_SUBTEST( array(Matrix<float, 1, 1>()) );
diff --git a/test/eigen2/basicstuff.cpp b/test/eigen2/eigen2_basicstuff.cpp
similarity index 99%
rename from test/eigen2/basicstuff.cpp
rename to test/eigen2/eigen2_basicstuff.cpp
index 21473cf8a..18be5d133 100644
--- a/test/eigen2/basicstuff.cpp
+++ b/test/eigen2/eigen2_basicstuff.cpp
@@ -109,7 +109,7 @@ template<typename MatrixType> void basicStuff(const MatrixType& m)
   }
 }
 
-void test_basicstuff()
+void test_eigen2_basicstuff()
 {
   for(int i = 0; i < g_repeat; i++) {
     CALL_SUBTEST( basicStuff(Matrix<float, 1, 1>()) );
diff --git a/test/eigen2/bug_132.cpp b/test/eigen2/eigen2_bug_132.cpp
similarity index 98%
rename from test/eigen2/bug_132.cpp
rename to test/eigen2/eigen2_bug_132.cpp
index aa9bf2c28..3ddcfdf06 100644
--- a/test/eigen2/bug_132.cpp
+++ b/test/eigen2/eigen2_bug_132.cpp
@@ -24,7 +24,7 @@
 
 #include "main.h"
 
-void test_bug_132() {
+void test_eigen2_bug_132() {
   enum { size = 100 };
   MatrixXd A(size, size);
   VectorXd b(size), c(size);
diff --git a/test/eigen2/cholesky.cpp b/test/eigen2/eigen2_cholesky.cpp
similarity index 99%
rename from test/eigen2/cholesky.cpp
rename to test/eigen2/eigen2_cholesky.cpp
index 108db9a21..e260852f8 100644
--- a/test/eigen2/cholesky.cpp
+++ b/test/eigen2/eigen2_cholesky.cpp
@@ -113,7 +113,7 @@ template<typename MatrixType> void cholesky(const MatrixType& m)
 #endif
 }
 
-void test_cholesky()
+void test_eigen2_cholesky()
 {
   for(int i = 0; i < g_repeat; i++) {
     CALL_SUBTEST( cholesky(Matrix<double,1,1>()) );
diff --git a/test/eigen2/commainitializer.cpp b/test/eigen2/eigen2_commainitializer.cpp
similarity index 98%
rename from test/eigen2/commainitializer.cpp
rename to test/eigen2/eigen2_commainitializer.cpp
index 503dd9be4..294ca446a 100644
--- a/test/eigen2/commainitializer.cpp
+++ b/test/eigen2/eigen2_commainitializer.cpp
@@ -24,7 +24,7 @@
 
 #include "main.h"
 
-void test_commainitializer()
+void test_eigen2_commainitializer()
 {
   Matrix3d m3;
   Matrix4d m4;
diff --git a/test/eigen2/cwiseop.cpp b/test/eigen2/eigen2_cwiseop.cpp
similarity index 99%
rename from test/eigen2/cwiseop.cpp
rename to test/eigen2/eigen2_cwiseop.cpp
index 25966db9a..d9c851396 100644
--- a/test/eigen2/cwiseop.cpp
+++ b/test/eigen2/eigen2_cwiseop.cpp
@@ -160,7 +160,7 @@ template<typename MatrixType> void cwiseops(const MatrixType& m)
   VERIFY( !(m1.cwise()>m1.unaryExpr(bind2nd(plus<Scalar>(), Scalar(1)))).any() );
 }
 
-void test_cwiseop()
+void test_eigen2_cwiseop()
 {
   for(int i = 0; i < g_repeat ; i++) {
     CALL_SUBTEST( cwiseops(Matrix<float, 1, 1>()) );
diff --git a/test/eigen2/determinant.cpp b/test/eigen2/eigen2_determinant.cpp
similarity index 98%
rename from test/eigen2/determinant.cpp
rename to test/eigen2/eigen2_determinant.cpp
index bc647d25d..edf4bd81f 100644
--- a/test/eigen2/determinant.cpp
+++ b/test/eigen2/eigen2_determinant.cpp
@@ -62,7 +62,7 @@ template<typename MatrixType> void determinant(const MatrixType& m)
   VERIFY_IS_APPROX(m2.determinant(), m1.determinant() * x);
 }
 
-void test_determinant()
+void test_eigen2_determinant()
 {
   for(int i = 0; i < g_repeat; i++) {
     CALL_SUBTEST( determinant(Matrix<float, 1, 1>()) );
diff --git a/test/eigen2/dynalloc.cpp b/test/eigen2/eigen2_dynalloc.cpp
similarity index 99%
rename from test/eigen2/dynalloc.cpp
rename to test/eigen2/eigen2_dynalloc.cpp
index b7951a680..1902b7c94 100644
--- a/test/eigen2/dynalloc.cpp
+++ b/test/eigen2/eigen2_dynalloc.cpp
@@ -102,7 +102,7 @@ template<typename T> void check_dynaligned()
   delete obj;
 }
 
-void test_dynalloc()
+void test_eigen2_dynalloc()
 {
   // low level dynamic memory allocation
   CALL_SUBTEST(check_handmade_aligned_malloc());
diff --git a/test/eigen2/eigensolver.cpp b/test/eigen2/eigen2_eigensolver.cpp
similarity index 99%
rename from test/eigen2/eigensolver.cpp
rename to test/eigen2/eigen2_eigensolver.cpp
index 34b8a22bc..2bc387889 100644
--- a/test/eigen2/eigensolver.cpp
+++ b/test/eigen2/eigen2_eigensolver.cpp
@@ -145,7 +145,7 @@ template<typename MatrixType> void eigensolver(const MatrixType& m)
 
 }
 
-void test_eigensolver()
+void test_eigen2_eigensolver()
 {
   for(int i = 0; i < g_repeat; i++) {
     // very important to test a 3x3 matrix since we provide a special path for it
diff --git a/test/eigen2/first_aligned.cpp b/test/eigen2/eigen2_first_aligned.cpp
similarity index 93%
rename from test/eigen2/first_aligned.cpp
rename to test/eigen2/eigen2_first_aligned.cpp
index f630e42f9..f6a4a3ba2 100644
--- a/test/eigen2/first_aligned.cpp
+++ b/test/eigen2/eigen2_first_aligned.cpp
@@ -25,21 +25,21 @@
 #include "main.h"
 
 template<typename Scalar>
-void test_first_aligned_helper(Scalar *array, int size)
+void test_eigen2_first_aligned_helper(Scalar *array, int size)
 {
   const int packet_size = sizeof(Scalar) * ei_packet_traits<Scalar>::size;
   VERIFY(((std::size_t(array) + sizeof(Scalar) * ei_alignmentOffset(array, size)) % packet_size) == 0);
 }
 
 template<typename Scalar>
-void test_none_aligned_helper(Scalar *array, int size)
+void test_eigen2_none_aligned_helper(Scalar *array, int size)
 {
   VERIFY(ei_packet_traits<Scalar>::size == 1 || ei_alignmentOffset(array, size) == size);
 }
 
 struct some_non_vectorizable_type { float x; };
 
-void test_first_aligned()
+void test_eigen2_first_aligned()
 {
   EIGEN_ALIGN_128 float array_float[100];
   test_first_aligned_helper(array_float, 50);
diff --git a/test/eigen2/geometry.cpp b/test/eigen2/eigen2_geometry.cpp
similarity index 99%
rename from test/eigen2/geometry.cpp
rename to test/eigen2/eigen2_geometry.cpp
index d0e69439b..62b24c67e 100644
--- a/test/eigen2/geometry.cpp
+++ b/test/eigen2/eigen2_geometry.cpp
@@ -437,7 +437,7 @@ template<typename Scalar> void geometry(void)
 
 }
 
-void test_geometry()
+void test_eigen2_geometry()
 {
   for(int i = 0; i < g_repeat; i++) {
     CALL_SUBTEST( geometry<float>() );
diff --git a/test/eigen2/hyperplane.cpp b/test/eigen2/eigen2_hyperplane.cpp
similarity index 99%
rename from test/eigen2/hyperplane.cpp
rename to test/eigen2/eigen2_hyperplane.cpp
index f1a96a717..681e9a67a 100644
--- a/test/eigen2/hyperplane.cpp
+++ b/test/eigen2/eigen2_hyperplane.cpp
@@ -128,7 +128,7 @@ template<typename Scalar> void lines()
   }
 }
 
-void test_hyperplane()
+void test_eigen2_hyperplane()
 {
   for(int i = 0; i < g_repeat; i++) {
     CALL_SUBTEST( hyperplane(Hyperplane<float,2>()) );
diff --git a/test/eigen2/inverse.cpp b/test/eigen2/eigen2_inverse.cpp
similarity index 99%
rename from test/eigen2/inverse.cpp
rename to test/eigen2/eigen2_inverse.cpp
index 9ddc9bb65..493151e58 100644
--- a/test/eigen2/inverse.cpp
+++ b/test/eigen2/eigen2_inverse.cpp
@@ -65,7 +65,7 @@ template<typename MatrixType> void inverse(const MatrixType& m)
   VERIFY_IS_APPROX(m1.transpose().inverse(), m1.inverse().transpose());
 }
 
-void test_inverse()
+void test_eigen2_inverse()
 {
   for(int i = 0; i < g_repeat; i++) {
     CALL_SUBTEST( inverse(Matrix<double,1,1>()) );
diff --git a/test/eigen2/linearstructure.cpp b/test/eigen2/eigen2_linearstructure.cpp
similarity index 99%
rename from test/eigen2/linearstructure.cpp
rename to test/eigen2/eigen2_linearstructure.cpp
index f913e6480..e951d17df 100644
--- a/test/eigen2/linearstructure.cpp
+++ b/test/eigen2/eigen2_linearstructure.cpp
@@ -84,7 +84,7 @@ template<typename MatrixType> void linearStructure(const MatrixType& m)
   VERIFY_IS_APPROX(m1.block(0,0,rows,cols) * s1, m1 * s1);
 }
 
-void test_linearstructure()
+void test_eigen2_linearstructure()
 {
   for(int i = 0; i < g_repeat; i++) {
     CALL_SUBTEST( linearStructure(Matrix<float, 1, 1>()) );
diff --git a/test/eigen2/lu.cpp b/test/eigen2/eigen2_lu.cpp
similarity index 99%
rename from test/eigen2/lu.cpp
rename to test/eigen2/eigen2_lu.cpp
index 51e94870c..5c608209c 100644
--- a/test/eigen2/lu.cpp
+++ b/test/eigen2/eigen2_lu.cpp
@@ -120,7 +120,7 @@ template<typename MatrixType> void lu_invertible()
   VERIFY(lu.solve(m3, &m2));
 }
 
-void test_lu()
+void test_eigen2_lu()
 {
   for(int i = 0; i < g_repeat; i++) {
     CALL_SUBTEST( lu_non_invertible<MatrixXf>() );
diff --git a/test/eigen2/map.cpp b/test/eigen2/eigen2_map.cpp
similarity index 99%
rename from test/eigen2/map.cpp
rename to test/eigen2/eigen2_map.cpp
index 3c51eec16..39aad1570 100644
--- a/test/eigen2/map.cpp
+++ b/test/eigen2/eigen2_map.cpp
@@ -105,7 +105,7 @@ template<typename VectorType> void map_static_methods(const VectorType& m)
 }
 
 
-void test_map()
+void test_eigen2_map()
 {
   for(int i = 0; i < g_repeat; i++) {
     CALL_SUBTEST( map_class_vector(Matrix<float, 1, 1>()) );
diff --git a/test/eigen2/meta.cpp b/test/eigen2/eigen2_meta.cpp
similarity index 99%
rename from test/eigen2/meta.cpp
rename to test/eigen2/eigen2_meta.cpp
index e77e46ba4..4afbafcdf 100644
--- a/test/eigen2/meta.cpp
+++ b/test/eigen2/eigen2_meta.cpp
@@ -24,7 +24,7 @@
 
 #include "main.h"
 
-void test_meta()
+void test_eigen2_meta()
 {
   typedef float & FloatRef;
   typedef const float & ConstFloatRef;
diff --git a/test/eigen2/miscmatrices.cpp b/test/eigen2/eigen2_miscmatrices.cpp
similarity index 98%
rename from test/eigen2/miscmatrices.cpp
rename to test/eigen2/eigen2_miscmatrices.cpp
index 4d2cd4346..f55ac6c98 100644
--- a/test/eigen2/miscmatrices.cpp
+++ b/test/eigen2/eigen2_miscmatrices.cpp
@@ -51,7 +51,7 @@ template<typename MatrixType> void miscMatrices(const MatrixType& m)
   VERIFY_IS_APPROX(square, MatrixType::Identity(rows, rows));
 }
 
-void test_miscmatrices()
+void test_eigen2_miscmatrices()
 {
   for(int i = 0; i < g_repeat; i++) {
     CALL_SUBTEST( miscMatrices(Matrix<float, 1, 1>()) );
diff --git a/test/eigen2/mixingtypes.cpp b/test/eigen2/eigen2_mixingtypes.cpp
similarity index 99%
rename from test/eigen2/mixingtypes.cpp
rename to test/eigen2/eigen2_mixingtypes.cpp
index ad03639a9..347cf9888 100644
--- a/test/eigen2/mixingtypes.cpp
+++ b/test/eigen2/eigen2_mixingtypes.cpp
@@ -79,7 +79,7 @@ template<int SizeAtCompileType> void mixingtypes(int size = SizeAtCompileType)
   VERIFY_RAISES_ASSERT(vcf.dot(vf)); // yeah eventually we should allow this but i'm too lazy to make that change now in Dot.h
 }                                    // especially as that might be rewritten as cwise product .sum() which would make that automatic.
 
-void test_mixingtypes()
+void test_eigen2_mixingtypes()
 {
   // check that our operator new is indeed called:
   CALL_SUBTEST(mixingtypes<3>());
diff --git a/test/eigen2/newstdvector.cpp b/test/eigen2/eigen2_newstdvector.cpp
similarity index 99%
rename from test/eigen2/newstdvector.cpp
rename to test/eigen2/eigen2_newstdvector.cpp
index 5862ee27b..d8b52cbb9 100644
--- a/test/eigen2/newstdvector.cpp
+++ b/test/eigen2/eigen2_newstdvector.cpp
@@ -133,7 +133,7 @@ void check_stdvector_quaternion(const QuaternionType&)
   }
 }
 
-void test_newstdvector()
+void test_eigen2_newstdvector()
 {
   // some non vectorizable fixed sizes
   CALL_SUBTEST(check_stdvector_matrix(Vector2f()));
diff --git a/test/eigen2/nomalloc.cpp b/test/eigen2/eigen2_nomalloc.cpp
similarity index 99%
rename from test/eigen2/nomalloc.cpp
rename to test/eigen2/eigen2_nomalloc.cpp
index 5497ca339..d523511bf 100644
--- a/test/eigen2/nomalloc.cpp
+++ b/test/eigen2/eigen2_nomalloc.cpp
@@ -68,7 +68,7 @@ template<typename MatrixType> void nomalloc(const MatrixType& m)
   VERIFY_IS_APPROX((m1*m1.transpose())*m2,  m1*(m1.transpose()*m2));
 }
 
-void test_nomalloc()
+void test_eigen2_nomalloc()
 {
   // check that our operator new is indeed called:
   VERIFY_RAISES_ASSERT(MatrixXd dummy = MatrixXd::Random(3,3));
diff --git a/test/eigen2/packetmath.cpp b/test/eigen2/eigen2_packetmath.cpp
similarity index 99%
rename from test/eigen2/packetmath.cpp
rename to test/eigen2/eigen2_packetmath.cpp
index 6fec9259d..a64d3b84d 100644
--- a/test/eigen2/packetmath.cpp
+++ b/test/eigen2/eigen2_packetmath.cpp
@@ -136,7 +136,7 @@ template<typename Scalar> void packetmath()
   VERIFY(areApprox(ref, data2, PacketSize) && "ei_preduxp");
 }
 
-void test_packetmath()
+void test_eigen2_packetmath()
 {
   for(int i = 0; i < g_repeat; i++) {
     CALL_SUBTEST( packetmath<float>() );
diff --git a/test/eigen2/parametrizedline.cpp b/test/eigen2/eigen2_parametrizedline.cpp
similarity index 98%
rename from test/eigen2/parametrizedline.cpp
rename to test/eigen2/eigen2_parametrizedline.cpp
index 4444432a6..c031d03da 100644
--- a/test/eigen2/parametrizedline.cpp
+++ b/test/eigen2/eigen2_parametrizedline.cpp
@@ -66,7 +66,7 @@ template<typename LineType> void parametrizedline(const LineType& _line)
   VERIFY_IS_APPROX(hp1d.template cast<Scalar>(),l0);
 }
 
-void test_parametrizedline()
+void test_eigen2_parametrizedline()
 {
   for(int i = 0; i < g_repeat; i++) {
     CALL_SUBTEST( parametrizedline(ParametrizedLine<float,2>()) );
diff --git a/test/eigen2/prec_inverse_4x4.cpp b/test/eigen2/eigen2_prec_inverse_4x4.cpp
similarity index 99%
rename from test/eigen2/prec_inverse_4x4.cpp
rename to test/eigen2/eigen2_prec_inverse_4x4.cpp
index 762c8ea32..1160563a2 100644
--- a/test/eigen2/prec_inverse_4x4.cpp
+++ b/test/eigen2/eigen2_prec_inverse_4x4.cpp
@@ -86,7 +86,7 @@ template<typename MatrixType> void inverse_general_4x4(int repeat)
   VERIFY(error_max < (NumTraits<Scalar>::IsComplex ? 64.0 : 20.0));
 }
 
-void test_prec_inverse_4x4()
+void test_eigen2_prec_inverse_4x4()
 {
   CALL_SUBTEST((inverse_permutation_4x4<Matrix4f>()));
   CALL_SUBTEST(( inverse_general_4x4<Matrix4f>(200000 * g_repeat) ));
diff --git a/test/eigen2/product_large.cpp b/test/eigen2/eigen2_product_large.cpp
similarity index 98%
rename from test/eigen2/product_large.cpp
rename to test/eigen2/eigen2_product_large.cpp
index 966d8ed76..5dc09dfa7 100644
--- a/test/eigen2/product_large.cpp
+++ b/test/eigen2/eigen2_product_large.cpp
@@ -24,7 +24,7 @@
 
 #include "product.h"
 
-void test_product_large()
+void test_eigen2_product_large()
 {
   for(int i = 0; i < g_repeat; i++) {
     CALL_SUBTEST( product(MatrixXf(ei_random<int>(1,320), ei_random<int>(1,320))) );
diff --git a/test/eigen2/product_small.cpp b/test/eigen2/eigen2_product_small.cpp
similarity index 97%
rename from test/eigen2/product_small.cpp
rename to test/eigen2/eigen2_product_small.cpp
index 1845c2c73..641b4151d 100644
--- a/test/eigen2/product_small.cpp
+++ b/test/eigen2/eigen2_product_small.cpp
@@ -25,7 +25,7 @@
 #define EIGEN_NO_STATIC_ASSERT
 #include "product.h"
 
-void test_product_small()
+void test_eigen2_product_small()
 {
   for(int i = 0; i < g_repeat; i++) {
     CALL_SUBTEST( product(Matrix<float, 3, 2>()) );
diff --git a/test/eigen2/qr.cpp b/test/eigen2/eigen2_qr.cpp
similarity index 99%
rename from test/eigen2/qr.cpp
rename to test/eigen2/eigen2_qr.cpp
index 877945731..f644ded5c 100644
--- a/test/eigen2/qr.cpp
+++ b/test/eigen2/eigen2_qr.cpp
@@ -57,7 +57,7 @@ template<typename MatrixType> void qr(const MatrixType& m)
   VERIFY_IS_APPROX(b, hess.matrixQ() * hess.matrixH() * hess.matrixQ().adjoint());
 }
 
-void test_qr()
+void test_eigen2_qr()
 {
   for(int i = 0; i < 1; i++) {
     CALL_SUBTEST( qr(Matrix2f()) );
diff --git a/test/eigen2/qtvector.cpp b/test/eigen2/eigen2_qtvector.cpp
similarity index 99%
rename from test/eigen2/qtvector.cpp
rename to test/eigen2/eigen2_qtvector.cpp
index 79c55b631..8bd000083 100644
--- a/test/eigen2/qtvector.cpp
+++ b/test/eigen2/eigen2_qtvector.cpp
@@ -142,7 +142,7 @@ void check_qtvector_quaternion(const QuaternionType&)
   }
 }
 
-void test_qtvector()
+void test_eigen2_qtvector()
 {
   // some non vectorizable fixed sizes
   CALL_SUBTEST(check_qtvector_matrix(Vector2f()));
diff --git a/test/eigen2/regression.cpp b/test/eigen2/eigen2_regression.cpp
similarity index 99%
rename from test/eigen2/regression.cpp
rename to test/eigen2/eigen2_regression.cpp
index 534ad3d1c..035840e9d 100644
--- a/test/eigen2/regression.cpp
+++ b/test/eigen2/eigen2_regression.cpp
@@ -91,7 +91,7 @@ void check_fitHyperplane(int numPoints,
   VERIFY(ei_abs(error) < ei_abs(tolerance));
 }
 
-void test_regression()
+void test_eigen2_regression()
 {
   for(int i = 0; i < g_repeat; i++)
   {
diff --git a/test/eigen2/sizeof.cpp b/test/eigen2/eigen2_sizeof.cpp
similarity index 98%
rename from test/eigen2/sizeof.cpp
rename to test/eigen2/eigen2_sizeof.cpp
index 6ccb2330c..73ed533e0 100644
--- a/test/eigen2/sizeof.cpp
+++ b/test/eigen2/eigen2_sizeof.cpp
@@ -33,7 +33,7 @@ template<typename MatrixType> void verifySizeOf(const MatrixType&)
     VERIFY(sizeof(MatrixType)==sizeof(Scalar*) + 2 * sizeof(typename MatrixType::Index));
 }
 
-void test_sizeof()
+void test_eigen2_sizeof()
 {
   CALL_SUBTEST( verifySizeOf(Matrix<float, 1, 1>()) );
   CALL_SUBTEST( verifySizeOf(Matrix4d()) );
diff --git a/test/eigen2/smallvectors.cpp b/test/eigen2/eigen2_smallvectors.cpp
similarity index 98%
rename from test/eigen2/smallvectors.cpp
rename to test/eigen2/eigen2_smallvectors.cpp
index eed30d99e..163c3e653 100644
--- a/test/eigen2/smallvectors.cpp
+++ b/test/eigen2/eigen2_smallvectors.cpp
@@ -47,7 +47,7 @@ template<typename Scalar> void smallVectors()
   VERIFY_IS_APPROX(x4, v4.w());
 }
 
-void test_smallvectors()
+void test_eigen2_smallvectors()
 {
   for(int i = 0; i < g_repeat; i++) {
     CALL_SUBTEST( smallVectors<int>() );
diff --git a/test/eigen2/sparse_basic.cpp b/test/eigen2/eigen2_sparse_basic.cpp
similarity index 99%
rename from test/eigen2/sparse_basic.cpp
rename to test/eigen2/eigen2_sparse_basic.cpp
index 410ef96a6..55f006bd9 100644
--- a/test/eigen2/sparse_basic.cpp
+++ b/test/eigen2/eigen2_sparse_basic.cpp
@@ -320,7 +320,7 @@ template<typename SparseMatrixType> void sparse_basic(const SparseMatrixType& re
   }
 }
 
-void test_sparse_basic()
+void test_eigen2_sparse_basic()
 {
   for(int i = 0; i < g_repeat; i++) {
     CALL_SUBTEST( sparse_basic(SparseMatrix<double>(8, 8)) );
diff --git a/test/eigen2/sparse_product.cpp b/test/eigen2/eigen2_sparse_product.cpp
similarity index 99%
rename from test/eigen2/sparse_product.cpp
rename to test/eigen2/eigen2_sparse_product.cpp
index dcfc58a14..3de0844db 100644
--- a/test/eigen2/sparse_product.cpp
+++ b/test/eigen2/eigen2_sparse_product.cpp
@@ -118,7 +118,7 @@ template<typename SparseMatrixType> void sparse_product(const SparseMatrixType&
 
 }
 
-void test_sparse_product()
+void test_eigen2_sparse_product()
 {
   for(int i = 0; i < g_repeat; i++) {
     CALL_SUBTEST( sparse_product(SparseMatrix<double>(8, 8)) );
diff --git a/test/eigen2/sparse_solvers.cpp b/test/eigen2/eigen2_sparse_solvers.cpp
similarity index 99%
rename from test/eigen2/sparse_solvers.cpp
rename to test/eigen2/eigen2_sparse_solvers.cpp
index 3d7f5b91e..a449fedda 100644
--- a/test/eigen2/sparse_solvers.cpp
+++ b/test/eigen2/eigen2_sparse_solvers.cpp
@@ -205,7 +205,7 @@ template<typename Scalar> void sparse_solvers(int rows, int cols)
 
 }
 
-void test_sparse_solvers()
+void test_eigen2_sparse_solvers()
 {
   for(int i = 0; i < g_repeat; i++) {
     CALL_SUBTEST( sparse_solvers<double>(8, 8) );
diff --git a/test/eigen2/sparse_vector.cpp b/test/eigen2/eigen2_sparse_vector.cpp
similarity index 99%
rename from test/eigen2/sparse_vector.cpp
rename to test/eigen2/eigen2_sparse_vector.cpp
index 934719f2c..a092d8f84 100644
--- a/test/eigen2/sparse_vector.cpp
+++ b/test/eigen2/eigen2_sparse_vector.cpp
@@ -88,7 +88,7 @@ template<typename Scalar> void sparse_vector(int rows, int cols)
 
 }
 
-void test_sparse_vector()
+void test_eigen2_sparse_vector()
 {
   for(int i = 0; i < g_repeat; i++) {
     CALL_SUBTEST( sparse_vector<double>(8, 8) );
diff --git a/test/eigen2/stdvector.cpp b/test/eigen2/eigen2_stdvector.cpp
similarity index 99%
rename from test/eigen2/stdvector.cpp
rename to test/eigen2/eigen2_stdvector.cpp
index 8d205f310..a05a00239 100644
--- a/test/eigen2/stdvector.cpp
+++ b/test/eigen2/eigen2_stdvector.cpp
@@ -132,7 +132,7 @@ void check_stdvector_quaternion(const QuaternionType&)
   }
 }
 
-void test_stdvector()
+void test_eigen2_stdvector()
 {
   // some non vectorizable fixed sizes
   CALL_SUBTEST(check_stdvector_matrix(Vector2f()));
diff --git a/test/eigen2/submatrices.cpp b/test/eigen2/eigen2_submatrices.cpp
similarity index 99%
rename from test/eigen2/submatrices.cpp
rename to test/eigen2/eigen2_submatrices.cpp
index 71bb65482..d95b0edaf 100644
--- a/test/eigen2/submatrices.cpp
+++ b/test/eigen2/eigen2_submatrices.cpp
@@ -150,7 +150,7 @@ template<typename MatrixType> void submatrices(const MatrixType& m)
   VERIFY(ei_real(ones.row(r1).dot(ones.row(r2))) == RealScalar(cols));
 }
 
-void test_submatrices()
+void test_eigen2_submatrices()
 {
   for(int i = 0; i < g_repeat; i++) {
     CALL_SUBTEST( submatrices(Matrix<float, 1, 1>()) );
diff --git a/test/eigen2/sum.cpp b/test/eigen2/eigen2_sum.cpp
similarity index 99%
rename from test/eigen2/sum.cpp
rename to test/eigen2/eigen2_sum.cpp
index fe707e9b2..f22f18d4e 100644
--- a/test/eigen2/sum.cpp
+++ b/test/eigen2/eigen2_sum.cpp
@@ -68,7 +68,7 @@ template<typename VectorType> void vectorSum(const VectorType& w)
   }
 }
 
-void test_sum()
+void test_eigen2_sum()
 {
   for(int i = 0; i < g_repeat; i++) {
     CALL_SUBTEST( matrixSum(Matrix<float, 1, 1>()) );
diff --git a/test/eigen2/svd.cpp b/test/eigen2/eigen2_svd.cpp
similarity index 99%
rename from test/eigen2/svd.cpp
rename to test/eigen2/eigen2_svd.cpp
index 3158782d8..c85a466d7 100644
--- a/test/eigen2/svd.cpp
+++ b/test/eigen2/eigen2_svd.cpp
@@ -85,7 +85,7 @@ template<typename MatrixType> void svd(const MatrixType& m)
   }
 }
 
-void test_svd()
+void test_eigen2_svd()
 {
   for(int i = 0; i < g_repeat; i++) {
     CALL_SUBTEST( svd(Matrix3f()) );
diff --git a/test/eigen2/swap.cpp b/test/eigen2/eigen2_swap.cpp
similarity index 99%
rename from test/eigen2/swap.cpp
rename to test/eigen2/eigen2_swap.cpp
index 8b325992c..9c934a759 100644
--- a/test/eigen2/swap.cpp
+++ b/test/eigen2/eigen2_swap.cpp
@@ -89,7 +89,7 @@ template<typename MatrixType> void swap(const MatrixType& m)
   VERIFY_RAISES_ASSERT(m1.row(0).swap(m1));
 }
 
-void test_swap()
+void test_eigen2_swap()
 {
   CALL_SUBTEST( swap(Matrix3f()) ); // fixed size, no vectorization 
   CALL_SUBTEST( swap(Matrix4d()) ); // fixed size, possible vectorization 
diff --git a/test/eigen2/triangular.cpp b/test/eigen2/eigen2_triangular.cpp
similarity index 99%
rename from test/eigen2/triangular.cpp
rename to test/eigen2/eigen2_triangular.cpp
index a74ca5e0b..279db9aac 100644
--- a/test/eigen2/triangular.cpp
+++ b/test/eigen2/eigen2_triangular.cpp
@@ -124,7 +124,7 @@ template<typename MatrixType> void triangular(const MatrixType& m)
 
 }
 
-void test_triangular()
+void test_eigen2_triangular()
 {
   for(int i = 0; i < g_repeat ; i++) {
     CALL_SUBTEST( triangular(Matrix<float, 1, 1>()) );
diff --git a/test/eigen2/unalignedassert.cpp b/test/eigen2/eigen2_unalignedassert.cpp
similarity index 98%
rename from test/eigen2/unalignedassert.cpp
rename to test/eigen2/eigen2_unalignedassert.cpp
index cf6f1bdf6..80dd1188c 100644
--- a/test/eigen2/unalignedassert.cpp
+++ b/test/eigen2/eigen2_unalignedassert.cpp
@@ -125,7 +125,7 @@ void unalignedassert()
 #endif
 }
 
-void test_unalignedassert()
+void test_eigen2_unalignedassert()
 {
   CALL_SUBTEST(unalignedassert());
 }
diff --git a/test/eigen2/visitor.cpp b/test/eigen2/eigen2_visitor.cpp
similarity index 99%
rename from test/eigen2/visitor.cpp
rename to test/eigen2/eigen2_visitor.cpp
index 6ec442bc8..55fca8e21 100644
--- a/test/eigen2/visitor.cpp
+++ b/test/eigen2/eigen2_visitor.cpp
@@ -112,7 +112,7 @@ template<typename VectorType> void vectorVisitor(const VectorType& w)
   VERIFY_IS_APPROX(maxc, v.maxCoeff());
 }
 
-void test_visitor()
+void test_eigen2_visitor()
 {
   for(int i = 0; i < g_repeat; i++) {
     CALL_SUBTEST( matrixVisitor(Matrix<float, 1, 1>()) );