Commit-ID:  a6f1de04276d036b61c4d1dbd0367e6b430d8783
Gitweb:     https://git.kernel.org/tip/a6f1de04276d036b61c4d1dbd0367e6b430d8783
Author:     Paul E. McKenney <paul...@linux.vnet.ibm.com>
AuthorDate: Mon, 3 Dec 2018 15:04:51 -0800
Committer:  Ingo Molnar <mi...@kernel.org>
CommitDate: Tue, 4 Dec 2018 07:29:52 +0100

tools/memory-model: Make scripts take "-j" abbreviation for "--jobs"

The "--jobs" argument to the litmus-test scripts is similar to the "-jN"
argument to "make", so this commit allows the "-jN" form as well.  While
in the area, it also prohibits the various forms of "-j0".

Suggested-by: Alan Stern <st...@rowland.harvard.edu>
Signed-off-by: Paul E. McKenney <paul...@linux.vnet.ibm.com>
Cc: Linus Torvalds <torva...@linux-foundation.org>
Cc: Peter Zijlstra <pet...@infradead.org>
Cc: Thomas Gleixner <t...@linutronix.de>
Cc: aki...@gmail.com
Cc: boqun.f...@gmail.com
Cc: dhowe...@redhat.com
Cc: j.algl...@ucl.ac.uk
Cc: linux-a...@vger.kernel.org
Cc: luc.maran...@inria.fr
Cc: npig...@gmail.com
Cc: parri.and...@gmail.com
Cc: will.dea...@arm.com
Link: http://lkml.kernel.org/r/20181203230451.28921-3-paul...@linux.ibm.com
Signed-off-by: Ingo Molnar <mi...@kernel.org>
---
 tools/memory-model/scripts/parseargs.sh | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/tools/memory-model/scripts/parseargs.sh 
b/tools/memory-model/scripts/parseargs.sh
index 96b307c8d64a..859e1d581e05 100644
--- a/tools/memory-model/scripts/parseargs.sh
+++ b/tools/memory-model/scripts/parseargs.sh
@@ -95,8 +95,18 @@ do
                LKMM_HERD_OPTIONS="$2"
                shift
                ;;
-       --jobs|--job)
-               checkarg --jobs "(number)" "$#" "$2" '^[0-9]\+$' '^--'
+       -j[1-9]*)
+               njobs="`echo $1 | sed -e 's/^-j//'`"
+               trailchars="`echo $njobs | sed -e 's/[0-9]\+\(.*\)$/\1/'`"
+               if test -n "$trailchars"
+               then
+                       echo $1 trailing characters "'$trailchars'"
+                       usagehelp
+               fi
+               LKMM_JOBS="`echo $njobs | sed -e 's/^\([0-9]\+\).*$/\1/'`"
+               ;;
+       --jobs|--job|-j)
+               checkarg --jobs "(number)" "$#" "$2" '^[1-9][0-9]\+$' '^--'
                LKMM_JOBS="$2"
                shift
                ;;

Reply via email to