* The 'check' and 'buildtests' scripts no longer take a jobs parameter.

Instead, they honor the EIGEN_JOBS environment variable if defined.
* The syntax ${BLABLA} in bash scripts was conflicting with CMake configured
  file syntax. Resolved by using the @ONLY option and the @BLABLA@ syntax.
This commit is contained in:
Benoit Jacob 2009-12-30 15:07:05 -05:00
parent 233540e58a
commit 2038f9cc8d
3 changed files with 21 additions and 21 deletions

View File

@ -1,6 +1,6 @@
get_property(EIGEN_TESTS_LIST GLOBAL PROPERTY EIGEN_TESTS_LIST)
configure_file(buildtests.in ${CMAKE_BINARY_DIR}/buildtests)
configure_file(buildtests.in ${CMAKE_BINARY_DIR}/buildtests @ONLY)
configure_file(check.in ${CMAKE_BINARY_DIR}/check)
configure_file(debug.in ${CMAKE_BINARY_DIR}/debug)
configure_file(release.in ${CMAKE_BINARY_DIR}/release)
configure_file(check.in ${CMAKE_BINARY_DIR}/check COPYONLY)
configure_file(debug.in ${CMAKE_BINARY_DIR}/debug COPYONLY)
configure_file(release.in ${CMAKE_BINARY_DIR}/release COPYONLY)

View File

@ -1,24 +1,22 @@
#!/bin/bash
if [ $# == 0 -o $# -ge 3 ]
if [ $# == 0 -o $# -ge 2 ]
then
echo "usage: ./buildtests regexp [jobs]"
echo " makes tests matching the regexp, with [jobs] concurrent make jobs"
echo "usage: ./buildtests regexp"
echo " Makes tests matching the regexp."
echo " The EIGEN_JOBS environment variable controls how many"
echo " concurrent jobs are launched."
exit 0
fi
TESTSLIST="${EIGEN_TESTS_LIST}"
TESTSLIST="@EIGEN_TESTS_LIST@"
targets_to_make=`echo "$TESTSLIST" | egrep "$1" | xargs echo`
if [ $# == 1 ]
if [ -n "${EIGEN_JOBS:+x}" ]
then
make $targets_to_make -j${EIGEN_JOBS}
else
make $targets_to_make
exit $?
fi
exit $?
if [ $# == 2 ]
then
make -j $2 $targets_to_make
exit $?
fi

View File

@ -1,12 +1,14 @@
#!/bin/bash
# check : shorthand for make and ctest -R
if [ $# == 0 -o $# -ge 3 ]
if [ $# == 0 -o $# -ge 2 ]
then
echo "usage: ./check regexp [jobs]"
echo " makes and runs tests matching the regexp, with [jobs] concurrent make jobs"
echo "usage: ./check regexp"
echo " Makes and runs tests matching the regexp."
echo " The EIGEN_JOBS environment variable controls how many"
echo " concurrent jobs are launched."
exit 0
fi
# TODO when ctest 2.8 comes out, honor the jobs parameter
./buildtests "$1" "${2:-1}" && ctest -R "$1"
# TODO ctest 2.8 is out, honor the jobs parameter
./buildtests "$1" && ctest -R "$1"