summaryrefslogtreecommitdiffstats
path: root/tools/memory-model/scripts
diff options
context:
space:
mode:
authorPaul E. McKenney <paulmck@kernel.org>2019-04-08 10:02:23 -0700
committerPaul E. McKenney <paulmck@kernel.org>2023-03-24 10:24:14 -0700
commit75eee921a1e9fc13d3b6766d98cdf842e843c31d (patch)
treeaf00e9705c496ece23f7b81b891592671fd8757f /tools/memory-model/scripts
parent2ac8cbee8ef3979df2d2291177d6ec6de7792af6 (diff)
downloadlinux-75eee921a1e9fc13d3b6766d98cdf842e843c31d.tar.gz
linux-75eee921a1e9fc13d3b6766d98cdf842e843c31d.tar.bz2
linux-75eee921a1e9fc13d3b6766d98cdf842e843c31d.zip
tools/memory-model: Make history-check scripts use mselect7
The history-check scripts currently use grep to ignore non-C-language litmus tests, which is a bit fragile. This commit therefore enlists the aid of "mselect7 -arch C", given Luc Maraget's recent modifications that allow mselect7 to operate in filter mode. This change requires herdtools 7.52-32-g1da3e0e50977 or later. Signed-off-by: Paul E. McKenney <paulmck@kernel.org>
Diffstat (limited to 'tools/memory-model/scripts')
-rwxr-xr-xtools/memory-model/scripts/initlitmushist.sh2
-rwxr-xr-xtools/memory-model/scripts/newlitmushist.sh2
2 files changed, 2 insertions, 2 deletions
diff --git a/tools/memory-model/scripts/initlitmushist.sh b/tools/memory-model/scripts/initlitmushist.sh
index 956b6957484d..31ea782955d3 100755
--- a/tools/memory-model/scripts/initlitmushist.sh
+++ b/tools/memory-model/scripts/initlitmushist.sh
@@ -60,7 +60,7 @@ fi
# Create a list of the C-language litmus tests with no more than the
# specified number of processes (per the --procs argument).
-find litmus -name '*.litmus' -exec grep -l -m 1 "^C " {} \; > $T/list-C
+find litmus -name '*.litmus' -print | mselect7 -arch C > $T/list-C
xargs < $T/list-C -r grep -L "^P${LKMM_PROCS}" > $T/list-C-short
scripts/runlitmushist.sh < $T/list-C-short
diff --git a/tools/memory-model/scripts/newlitmushist.sh b/tools/memory-model/scripts/newlitmushist.sh
index 3f4b06e29988..25235e2049cf 100755
--- a/tools/memory-model/scripts/newlitmushist.sh
+++ b/tools/memory-model/scripts/newlitmushist.sh
@@ -43,7 +43,7 @@ fi
# Form full list of litmus tests with no more than the specified
# number of processes (per the --procs argument).
-find litmus -name '*.litmus' -exec grep -l -m 1 "^C " {} \; > $T/list-C-all
+find litmus -name '*.litmus' -print | mselect7 -arch C > $T/list-C-all
xargs < $T/list-C-all -r grep -L "^P${LKMM_PROCS}" > $T/list-C-short
# Form list of new tests. Note: This does not handle litmus-test deletion!