aboutsummaryrefslogtreecommitdiffhomepage
path: root/test
diff options
context:
space:
mode:
authorGravatar Benoit Jacob <jacob.benoit.1@gmail.com>2009-11-12 12:07:18 -0500
committerGravatar Benoit Jacob <jacob.benoit.1@gmail.com>2009-11-12 12:07:18 -0500
commit358452bbe6a3fcc8290969dbd531e30701a4c1f2 (patch)
treee6381db65f5583ad0ac680da66aff5ac749df0cf /test
parentfc492b6264249e8ec5b7234d8d53047c49fcb710 (diff)
* add ./debug and ./release scripts
* update the messages * rename EIGEN_CMAKE_RUN_FROM_CTEST to something saner
Diffstat (limited to 'test')
-rw-r--r--test/CMakeLists.txt3
-rwxr-xr-xtest/maketests.in21
-rwxr-xr-xtest/mctestr.in14
-rw-r--r--test/testsuite.cmake2
4 files changed, 1 insertions, 39 deletions
diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
index aad1572f7..d0938302f 100644
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -162,6 +162,3 @@ if(CMAKE_COMPILER_IS_GNUCXX)
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(mctestr.in ${CMAKE_BINARY_DIR}/mctestr)
diff --git a/test/maketests.in b/test/maketests.in
deleted file mode 100755
index f9cafed26..000000000
--- a/test/maketests.in
+++ /dev/null
@@ -1,21 +0,0 @@
-#!/bin/bash
-
-if [ $# == 0 -o $# -ge 3 ]
-then
- echo "usage: ./maketests regexp [jobs]"
- echo " makes tests matching the regexp, with <jobs> concurrent make jobs"
- exit 0
-fi
-
-TESTSLIST="${cmake_tests_list}"
-targets_to_make=`echo "$TESTSLIST" | grep "$1" | sed s/^/test_/g | xargs`
-
-if [ $# == 1 ]
-then
- make $targets_to_make
-fi
-
-if [ $# == 2 ]
-then
- make -j $2 $targets_to_make
-fi
diff --git a/test/mctestr.in b/test/mctestr.in
deleted file mode 100755
index a388ef38f..000000000
--- a/test/mctestr.in
+++ /dev/null
@@ -1,14 +0,0 @@
-#!/bin/bash
-# mctestr : shorthand for make and ctest -R
-
-if [ $# == 0 -o $# -ge 3 ]
-then
- echo "usage: ./mctestr regexp [jobs]"
- echo " makes and runs tests matching the regexp, with <jobs> concurrent make jobs"
- exit 0
-fi
-
-./maketests $*
-
-# TODO when ctest 2.8 comes out, honor the jobs parameter
-ctest -R $1 \ No newline at end of file
diff --git a/test/testsuite.cmake b/test/testsuite.cmake
index 5d0cb6585..9c38e48b1 100644
--- a/test/testsuite.cmake
+++ b/test/testsuite.cmake
@@ -148,7 +148,7 @@ endif(NOT EIGEN_NO_UPDATE)
# which ctest command to use for running the dashboard
SET (CTEST_COMMAND "${EIGEN_CMAKE_DIR}ctest -D ${EIGEN_MODE}")
# what cmake command to use for configuring this dashboard
-SET (CTEST_CMAKE_COMMAND "${EIGEN_CMAKE_DIR}cmake -DEIGEN_CMAKE_RUN_FROM_CTEST=ON")
+SET (CTEST_CMAKE_COMMAND "${EIGEN_CMAKE_DIR}cmake -DEIGEN_LEAVE_TEST_IN_ALL_TARGET=ON")
####################################################################
# The values in this section are optional you can either