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 <stern@rowland.harvard.edu>
Signed-off-by: Paul E. McKenney <paulmck@linux.vnet.ibm.com>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: akiyks@gmail.com
Cc: boqun.feng@gmail.com
Cc: dhowells@redhat.com
Cc: j.alglave@ucl.ac.uk
Cc: linux-arch@vger.kernel.org
Cc: luc.maranget@inria.fr
Cc: npiggin@gmail.com
Cc: parri.andrea@gmail.com
Cc: will.deacon@arm.com
Link: http://lkml.kernel.org/r/20181203230451.28921-3-paulmck@linux.ibm.com
Signed-off-by: Ingo Molnar <mingo@kernel.org>

diff --git a/tools/memory-model/scripts/parseargs.sh b/tools/memory-model/scripts/parseargs.sh
index 96b307c8d64a14aa267c45aa6c130c05d752b1ba..859e1d581e0511ff01fd1a5f6170a80d02c5fbbd 100644 (file)
--- 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
                ;;