Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

tools/memory-model: Move from .AArch64.litmus.out to .litmus.AArch.out

When the github scripts see ".litmus.out", they assume that there must be
a corresponding C-language ".litmus" file. Won't they be disappointed
when they instead see nothing, or, worse yet, the corresponding
assembly-language litmus test? This commit therefore swaps the hardware
tag with the "litmus" to avoid this sort of disappointment.

This commit also adjusts the .gitignore file so as to avoid adding these
new ".out" files to git.

[ paulmck: Apply Akira Yokosawa feedback. ]
Signed-off-by: Paul E. McKenney <paulmck@kernel.org>

+4 -4
+1 -1
tools/memory-model/litmus-tests/.gitignore
··· 1 1 # SPDX-License-Identifier: GPL-2.0-only 2 - *.litmus.out 2 + *.out
+2 -2
tools/memory-model/scripts/judgelitmus.sh
··· 6 6 # test ran correctly. If the --hw argument is omitted, check against the 7 7 # LKMM output, which is assumed to be in file.litmus.out. If this argument 8 8 # is provided, this is assumed to be a hardware test, and the output is 9 - # assumed to be in file.HW.litmus.out, where "HW" is the --hw argument. 9 + # assumed to be in file.litmus.HW.out, where "HW" is the --hw argument. 10 10 # In addition, non-Sometimes verification results will be noted, but 11 11 # forgiven. Furthermore, if there is no "Result:" comment but there is 12 12 # an LKMM .litmus.out file, the observation in that file will be used ··· 37 37 lkmmout= 38 38 else 39 39 litmusout="`echo $litmus | 40 - sed -e 's/\.litmus$/.'${LKMM_HW_MAP_FILE}'.litmus/'`.out" 40 + sed -e 's/\.litmus$/.litmus.'${LKMM_HW_MAP_FILE}'/'`.out" 41 41 lkmmout=$litmus.out 42 42 fi 43 43 if test -f "$LKMM_DESTDIR/$litmusout" -a -r "$LKMM_DESTDIR/$litmusout"
+1 -1
tools/memory-model/scripts/runlitmus.sh
··· 57 57 mapfile="Linux2${LKMM_HW_MAP_FILE}.map" 58 58 themefile="$T/${LKMM_HW_MAP_FILE}.theme" 59 59 herdoptions="-model $LKMM_HW_CAT_FILE" 60 - hwlitmus=`echo $litmus | sed -e 's/\.litmus$/.'${LKMM_HW_MAP_FILE}'.litmus/'` 60 + hwlitmus=`echo $litmus | sed -e 's/\.litmus$/.litmus.'${LKMM_HW_MAP_FILE}'/'` 61 61 hwlitmusfile=`echo $hwlitmus | sed -e 's,^.*/,,'` 62 62 63 63 # Don't run on litmus tests with complex synchronization