Commit ee542816 authored by Paul E. McKenney's avatar Paul E. McKenney
Browse files

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: default avatarPaul E. McKenney <paulmck@kernel.org>
parent dbf0b425

tools/memory-model/litmus-tests/.gitignore

+1 −1
Original line number Diff line number Diff line 
# SPDX-License-Identifier: GPL-2.0-only

*.litmus.out
 
*.out

tools/memory-model/scripts/judgelitmus.sh

+2 −2
Original line number Diff line number Diff line
@@ -6,7 +6,7 @@ 
# test ran correctly.  If the --hw argument is omitted, check against the

# LKMM output, which is assumed to be in file.litmus.out.  If this argument

# is provided, this is assumed to be a hardware test, and the output is

# assumed to be in file.HW.litmus.out, where "HW" is the --hw argument.

# assumed to be in file.litmus.HW.out, where "HW" is the --hw argument.

# In addition, non-Sometimes verification results will be noted, but

# forgiven.  Furthermore, if there is no "Result:" comment but there is

# an LKMM .litmus.out file, the observation in that file will be used
@@ -37,7 +37,7 @@ then 
	lkmmout=

else

	litmusout="`echo $litmus |

		sed -e 's/\.litmus$/.'${LKMM_HW_MAP_FILE}'.litmus/'`.out"

		sed -e 's/\.litmus$/.litmus.'${LKMM_HW_MAP_FILE}'/'`.out"

	lkmmout=$litmus.out

fi

if test -f "$LKMM_DESTDIR/$litmusout" -a -r "$LKMM_DESTDIR/$litmusout"

tools/memory-model/scripts/runlitmus.sh

+1 −1
Original line number Diff line number Diff line
@@ -57,7 +57,7 @@ catfile="`echo $LKMM_HW_MAP_FILE | tr '[A-Z]' '[a-z]'`.cat" 
mapfile="Linux2${LKMM_HW_MAP_FILE}.map"

themefile="$T/${LKMM_HW_MAP_FILE}.theme"

herdoptions="-model $LKMM_HW_CAT_FILE"

hwlitmus=`echo $litmus | sed -e 's/\.litmus$/.'${LKMM_HW_MAP_FILE}'.litmus/'`

hwlitmus=`echo $litmus | sed -e 's/\.litmus$/.litmus.'${LKMM_HW_MAP_FILE}'/'`

hwlitmusfile=`echo $hwlitmus | sed -e 's,^.*/,,'`



# Don't run on litmus tests with complex synchronization