From 36fc372482bc4eb8b96e546b5337d03bef341dcf Mon Sep 17 00:00:00 2001
From: Rob Landley <rob@landley.net>
Date: Mon, 4 May 2026 12:37:15 -0500
Subject: [PATCH] Require 5 processors to display stride (it's 1,3 not 1,3:2)
 and use skipnot instead of if so tests display as skipped instead of varying
 the number of test lines output.

---
 tests/taskset.test | 28 +++++++++++++---------------
 1 file changed, 13 insertions(+), 15 deletions(-)

diff --git a/tests/taskset.test b/tests/taskset.test
index b9e1e779..73e62d00 100755
--- a/tests/taskset.test
+++ b/tests/taskset.test
@@ -28,10 +28,9 @@ testcmd 'run on first' '1 ps -o psr= $BASHPID | xargs' '0\n' '' ''
 testcmd 'run on last' '$LAST ps -o psr= $BASHPID | xargs' "$((CPUS-1))\n" '' ''
 
 # mask -> CPU list
-if [ $CPUS -gt 1 ]; then
-  testcmd 'print all as CPU list' \
-    '$MASK taskset -pc 0 | sed "s/.*: //"' "0-$((CPUS-1))\n" '' ''
-fi
+skipnot [ $CPUS -gt 1 ]
+testcmd 'print all as CPU list' \
+  '$MASK taskset -pc 0 | sed "s/.*: //"' "0-$((CPUS-1))\n" '' ''
 testcmd 'print first as CPU list' \
   '1 taskset -pc 0 | sed "s/.*: //"' '0\n' '' ''
 testcmd 'print last as CPU list' \
@@ -48,17 +47,16 @@ testcmd 'set CPU list to last' \
   '-c $((CPUS-1)) taskset -p 0 | sed "s/.*: //"' "$LAST\n" '' ''
 
 # CPU list -> CPU list
-if [ $CPUS -gt 2 ]; then
-  testcmd 'even CPU list' \
-    '-c $(seq -s, 0 2 $CPUS) taskset -pc 0 | sed "s/.*: //"' \
-    "0-$((($CPUS-1)&~1)):2\n" '' ''
-fi
-if [ $CPUS -gt 5 ]; then
-  # Prints as 0,1-5:2, not 0,1,3,5, since 1 not consumed as part of a
-  # range starting at 0.
-  testcmd 'CPU list printing not greedy' \
-    '-c 0,1-5:2 taskset -pc 0 | sed "s/.*: //"' '0,1-5:2\n' '' ''
-fi
+skipnot [ $CPUS -gt 5 ]
+testcmd 'even CPU list' \
+  '-c $(seq -s, 0 2 $CPUS) taskset -pc 0 | sed "s/.*: //"' \
+  "0-$((($CPUS-1)&~1)):2\n" '' ''
+
+# Prints as 0,1-5:2, not 0,1,3,5, since 1 not consumed as part of a
+# range starting at 0.
+skipnot [ $CPUS -gt 5 ]
+testcmd 'CPU list printing not greedy' \
+  '-c 0,1-5:2 taskset -pc 0 | sed "s/.*: //"' '0,1-5:2\n' '' ''
 
 testcmd "long mask doesn't segfault" \
   '$(printf %99999s | tr \  0)f echo; echo $?' '\n0\n' '' ''
-- 
2.39.5