All of lore.kernel.org
 help / color / mirror / Atom feed
From: "Paul E. McKenney" <paulmck@linux.ibm.com>
To: linux-kernel@vger.kernel.org, linux-arch@vger.kernel.org,
	mingo@kernel.org
Cc: stern@rowland.harvard.edu, andrea.parri@amarulasolutions.com,
	will.deacon@arm.com, peterz@infradead.org, boqun.feng@gmail.com,
	npiggin@gmail.com, dhowells@redhat.com, j.alglave@ucl.ac.uk,
	luc.maranget@inria.fr, akiyks@gmail.com,
	"Paul E. McKenney" <paulmck@linux.ibm.com>
Subject: [PATCH tip/core/rcu 18/21] tools/memory-model: Move from .AArch64.litmus.out to .litmus.AArch.out
Date: Tue, 26 Mar 2019 16:41:30 -0700	[thread overview]
Message-ID: <20190326234133.24962-18-paulmck@linux.ibm.com> (raw)
In-Reply-To: <20190326234114.GA23843@linux.ibm.com>

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.

Signed-off-by: Paul E. McKenney <paulmck@linux.ibm.com>
---
 tools/memory-model/litmus-tests/.gitignore | 2 +-
 tools/memory-model/scripts/judgelitmus.sh  | 2 +-
 tools/memory-model/scripts/runlitmus.sh    | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/tools/memory-model/litmus-tests/.gitignore b/tools/memory-model/litmus-tests/.gitignore
index 6e2ddc54152f..f47cb2045f13 100644
--- a/tools/memory-model/litmus-tests/.gitignore
+++ b/tools/memory-model/litmus-tests/.gitignore
@@ -1 +1 @@
-*.litmus.out
+*.out
diff --git a/tools/memory-model/scripts/judgelitmus.sh b/tools/memory-model/scripts/judgelitmus.sh
index a1313f9960c3..6ecd223c0f4c 100755
--- a/tools/memory-model/scripts/judgelitmus.sh
+++ b/tools/memory-model/scripts/judgelitmus.sh
@@ -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"
diff --git a/tools/memory-model/scripts/runlitmus.sh b/tools/memory-model/scripts/runlitmus.sh
index 186944a7a528..154c95ce79da 100755
--- a/tools/memory-model/scripts/runlitmus.sh
+++ b/tools/memory-model/scripts/runlitmus.sh
@@ -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
-- 
2.17.1


  parent reply	other threads:[~2019-03-26 23:42 UTC|newest]

Thread overview: 28+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-03-26 23:41 [PATCH RFC memory-model 0/21] LKMM updates for review Paul E. McKenney
2019-03-26 23:41 ` [PATCH tip/core/rcu 01/21] tools/memory-model: Make scripts be executable Paul E. McKenney
2019-03-26 23:41 ` [PATCH tip/core/rcu 02/21] tools/memory-model: Fix comment in MP+poonceonces.litmus Paul E. McKenney
2019-03-26 23:41 ` [PATCH tip/core/rcu 03/21] tools/memory-model: Do not use "herd" to refer to "herd7" Paul E. McKenney
2019-03-26 23:41 ` [PATCH tip/core/rcu 04/21] docs/memory-barriers.txt: Rewrite "KERNEL I/O BARRIER EFFECTS" section Paul E. McKenney
2019-04-02 13:03   ` Will Deacon
2019-04-04 15:58     ` Akira Yokosawa
2019-04-04 16:40       ` Will Deacon
2019-04-04 22:23         ` Akira Yokosawa
2019-03-26 23:41 ` [PATCH tip/core/rcu 05/21] tools/memory-model: Make judgelitmus.sh note timeouts Paul E. McKenney
2019-03-26 23:41 ` [PATCH tip/core/rcu 06/21] tools/memory-model: Make cmplitmushist.sh " Paul E. McKenney
2019-03-26 23:41 ` [PATCH tip/core/rcu 07/21] tools/memory-model: Make judgelitmus.sh identify bad macros Paul E. McKenney
2019-03-26 23:41 ` [PATCH tip/core/rcu 08/21] tools/memory-model: Add support for synchronize_srcu_expedited() Paul E. McKenney
2019-04-02 14:49   ` Andrea Parri
2019-04-04 20:50     ` Paul E. McKenney
2019-03-26 23:41 ` [PATCH tip/core/rcu 09/21] tools/memory-model: Make judgelitmus.sh detect hard deadlocks Paul E. McKenney
2019-03-26 23:41 ` [PATCH tip/core/rcu 10/21] tools/memory-model: Update parseargs.sh for hardware verification Paul E. McKenney
2019-03-26 23:41 ` [PATCH tip/core/rcu 11/21] tools/memory-model: Make judgelitmus.sh handle hardware verifications Paul E. McKenney
2019-03-26 23:41 ` [PATCH tip/core/rcu 12/21] tools/memory-model: Add simpletest.sh to check locking, RCU, and SRCU Paul E. McKenney
2019-03-26 23:41 ` [PATCH tip/core/rcu 13/21] tools/memory-model: Fix checkalllitmus.sh comment Paul E. McKenney
2019-03-26 23:41 ` [PATCH tip/core/rcu 14/21] tools/memory-model: Hardware checking for check{,all}litmus.sh Paul E. McKenney
2019-03-26 23:41 ` [PATCH tip/core/rcu 15/21] tools/memory-model: Make judgelitmus.sh ransack .litmus.out files Paul E. McKenney
2019-03-26 23:41 ` [PATCH tip/core/rcu 16/21] tools/memory-model: Split runlitmus.sh out of checklitmus.sh Paul E. McKenney
2019-03-26 23:41 ` [PATCH tip/core/rcu 17/21] tools/memory-model: Make runlitmus.sh generate .litmus.out for --hw Paul E. McKenney
2019-03-26 23:41 ` Paul E. McKenney [this message]
2019-03-26 23:41 ` [PATCH tip/core/rcu 19/21] tools/memory-model: Keep assembly-language litmus tests Paul E. McKenney
2019-03-26 23:41 ` [PATCH tip/core/rcu 20/21] tools/memory-model: Allow herd to deduce CPU type Paul E. McKenney
2019-03-26 23:41 ` [PATCH tip/core/rcu 21/21] tools/memory-model: Make runlitmus.sh check for jingle errors Paul E. McKenney

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20190326234133.24962-18-paulmck@linux.ibm.com \
    --to=paulmck@linux.ibm.com \
    --cc=akiyks@gmail.com \
    --cc=andrea.parri@amarulasolutions.com \
    --cc=boqun.feng@gmail.com \
    --cc=dhowells@redhat.com \
    --cc=j.alglave@ucl.ac.uk \
    --cc=linux-arch@vger.kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=luc.maranget@inria.fr \
    --cc=mingo@kernel.org \
    --cc=npiggin@gmail.com \
    --cc=peterz@infradead.org \
    --cc=stern@rowland.harvard.edu \
    --cc=will.deacon@arm.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.