Instead of EIGEN_JOBS, introduce EIGEN_MAKE_ARGS and EIGEN_CTEST_ARGS. This is much more powerful!

Notice that CTest 2.8 supports the -j argument, although that is undocumented.
Last commit of 2009! Happy new year to all!
This commit is contained in:
Benoit Jacob 2009-12-31 16:13:56 -05:00
parent 2038f9cc8d
commit c436d94f18
2 changed files with 20 additions and 13 deletions

View File

@ -1,20 +1,20 @@
#!/bin/bash #!/bin/bash
if [ $# == 0 -o $# -ge 2 ] if [[ $# != 1 || $1 == *help ]]
then then
echo "usage: ./buildtests regexp" echo "usage: ./check regexp"
echo " Makes tests matching the regexp." echo " Builds tests matching the regexp."
echo " The EIGEN_JOBS environment variable controls how many" echo " The EIGEN_MAKE_ARGS environment variable allows to pass args to 'make'."
echo " concurrent jobs are launched." echo " For example, to launch 5 concurrent builds, use EIGEN_MAKE_ARGS='-j5'"
exit 0 exit 0
fi fi
TESTSLIST="@EIGEN_TESTS_LIST@" TESTSLIST="@EIGEN_TESTS_LIST@"
targets_to_make=`echo "$TESTSLIST" | egrep "$1" | xargs echo` targets_to_make=`echo "$TESTSLIST" | egrep "$1" | xargs echo`
if [ -n "${EIGEN_JOBS:+x}" ] if [ -n "${EIGEN_MAKE_ARGS:+x}" ]
then then
make $targets_to_make -j${EIGEN_JOBS} make $targets_to_make ${EIGEN_MAKE_ARGS}
else else
make $targets_to_make make $targets_to_make
fi fi

View File

@ -1,14 +1,21 @@
#!/bin/bash #!/bin/bash
# check : shorthand for make and ctest -R # check : shorthand for make and ctest -R
if [ $# == 0 -o $# -ge 2 ] if [[ $# != 1 || $1 == *help ]]
then then
echo "usage: ./check regexp" echo "usage: ./check regexp"
echo " Makes and runs tests matching the regexp." echo " Builds and runs tests matching the regexp."
echo " The EIGEN_JOBS environment variable controls how many" echo " The EIGEN_MAKE_ARGS environment variable allows to pass args to 'make'."
echo " concurrent jobs are launched." echo " For example, to launch 5 concurrent builds, use EIGEN_MAKE_ARGS='-j5'"
echo " The EIGEN_CTEST_ARGS environment variable allows to pass args to 'ctest'."
echo " For example, with CTest 2.8, you can use EIGEN_CTEST_ARGS='-j5'."
exit 0 exit 0
fi fi
# TODO ctest 2.8 is out, honor the jobs parameter if [ -n "${EIGEN_CTEST_ARGS:+x}" ]
./buildtests "$1" && ctest -R "$1" then
./buildtests "$1" && ctest -R "$1" ${EIGEN_CTEST_ARGS}
else
./buildtests "$1" && ctest -R "$1"
fi
exit $?