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!

2 files changed, 20 insertions, 13 deletions

diff --git a/scripts/buildtests.in b/scripts/buildtests.in
index aa1a4319f..7026373cf 100755
--- a/scripts/buildtests.in
+++ b/scripts/buildtests.in
@@ -1,20 +1,20 @@
 #!/bin/bash
 
-if [ $# == 0 -o $# -ge 2 ]
+if [[ $# != 1 || $1 == *help ]]
 then
-  echo "usage: ./buildtests regexp"
-  echo "  Makes tests matching the regexp."
-  echo "  The EIGEN_JOBS environment variable controls how many"
-  echo "  concurrent jobs are launched."
+  echo "usage: ./check regexp"
+  echo "  Builds tests matching the regexp."
+  echo "  The EIGEN_MAKE_ARGS environment variable allows to pass args to 'make'."
+  echo "    For example, to launch 5 concurrent builds, use EIGEN_MAKE_ARGS='-j5'"
   exit 0
 fi
 
 TESTSLIST="@EIGEN_TESTS_LIST@"
 targets_to_make=`echo "$TESTSLIST" | egrep "$1" | xargs echo`
 
-if [ -n "${EIGEN_JOBS:+x}" ]
+if [ -n "${EIGEN_MAKE_ARGS:+x}" ]
 then
-  make $targets_to_make -j${EIGEN_JOBS}
+  make $targets_to_make ${EIGEN_MAKE_ARGS}
 else
   make $targets_to_make
 fi
diff --git a/scripts/check.in b/scripts/check.in
index e1fdccd0a..d6a8466e2 100755
--- a/scripts/check.in
+++ b/scripts/check.in
@@ -1,14 +1,21 @@
 #!/bin/bash
 # check : shorthand for make and ctest -R
 
-if [ $# == 0 -o $# -ge 2 ]
+if [[ $# != 1 || $1 == *help ]]
 then
   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."
+  echo "  Builds and runs tests matching the regexp."
+  echo "  The EIGEN_MAKE_ARGS environment variable allows to pass args to 'make'."
+  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
 fi
 
-# TODO ctest 2.8 is out, honor the jobs parameter
-./buildtests "$1" && ctest -R "$1"
+if [ -n "${EIGEN_CTEST_ARGS:+x}" ]
+then
+  ./buildtests "$1" && ctest -R "$1" ${EIGEN_CTEST_ARGS}
+else
+  ./buildtests "$1" && ctest -R "$1"
+fi
+exit $?