Skip to contentSkip to conversation

s390x: Fix arch_cmd

PATCH In review Andrew Jones 3 participants 4 messages Jul 9, 2025 – Jul 11, 2025 s390

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 s390x: Fix arch_cmd

As commit ("scripts: Add 'test_args' test definition parameter") states in its summary, it adds another parameter. Make sure we account for it in the s390x-specific arch_cmd as well.

Fixes a7794f16c84a ("scripts: Add 'test_args' test definition parameter")
---
 scripts/s390x/func.bash | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)
scripts/s390x/func.bash +9 -8
index f04e8e2ac0a7..28c3a70c7da9 100644
@@ -11,15 +11,16 @@ function arch_cmd_s390x()
 	local groups=$3
 	local smp=$4
 	local kernel=$5
-	local opts=$6
-	local arch=$7
-	local machine=$8
-	local check=$9
-	local accel=${10}
-	local timeout=${11}
+	local test_args=$6
+	local opts=$7
+	local arch=$8
+	local machine=$9
+	local check=${10}
+	local accel=${11}
+	local timeout=${12}
 
 	# run the normal test case
-	"$cmd" "$testname" "$groups" "$smp" "$kernel" "$opts" "$arch" "$machine" "$check" "$accel" "$timeout"
+	"$cmd" "$testname" "$groups" "$smp" "$kernel" "$test_args" "$opts" "$arch" "$machine" "$check" "$accel" "$timeout"
 
 	# run PV test case
 	if [ "$accel" = 'tcg' ] || grep -q "migration" <<< "$groups"; then
@@ -35,5 +36,5 @@ function arch_cmd_s390x()
 		print_result 'SKIP' $testname '' 'PVM image was not created'
 		return 2
 	fi
-	"$cmd" "$testname" "$groups pv" "$smp" "$kernel" "$opts" "$arch" "$machine" "$check" "$accel" "$timeout"
+	"$cmd" "$testname" "$groups pv" "$smp" "$kernel" "$test_args" "$opts" "$arch" "$machine" "$check" "$accel" "$timeout"
 }
Signature · 1 line
2.49.0
Acked-by on v1 1/1
#1 lore raw
Quoted 6 lines · On Wed, 9 Jul 2025 10:59:39 +0200 Andrew Jones <[email protected]> wrote:

As commit ("scripts: Add 'test_args' test definition parameter") states in its summary, it adds another parameter. Make sure we account for it in the s390x-specific arch_cmd as well.

Fixes a7794f16c84a ("scripts: Add 'test_args' test definition parameter")
Quoted 39 lines
---
 scripts/s390x/func.bash | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)
scripts/s390x/func.bash +9 -8
index f04e8e2ac0a7..28c3a70c7da9 100644
@@ -11,15 +11,16 @@ function arch_cmd_s390x()
 	local groups=$3
 	local smp=$4
 	local kernel=$5
-	local opts=$6
-	local arch=$7
-	local machine=$8
-	local check=$9
-	local accel=${10}
-	local timeout=${11}
+	local test_args=$6
+	local opts=$7
+	local arch=$8
+	local machine=$9
+	local check=${10}
+	local accel=${11}
+	local timeout=${12}
 
 	# run the normal test case
-	"$cmd" "$testname" "$groups" "$smp" "$kernel" "$opts" "$arch" "$machine" "$check" "$accel" "$timeout"
+	"$cmd" "$testname" "$groups" "$smp" "$kernel" "$test_args" "$opts" "$arch" "$machine" "$check" "$accel" "$timeout"
 
 	# run PV test case
 	if [ "$accel" = 'tcg' ] || grep -q "migration" <<< "$groups"; then
@@ -35,5 +36,5 @@ function arch_cmd_s390x()
 		print_result 'SKIP' $testname '' 'PVM image was not created'
 		return 2
 	fi
-	"$cmd" "$testname" "$groups pv" "$smp" "$kernel" "$opts" "$arch" "$machine" "$check" "$accel" "$timeout"
+	"$cmd" "$testname" "$groups pv" "$smp" "$kernel" "$test_args" "$opts" "$arch" "$machine" "$check" "$accel" "$timeout"
 }
Reviewed-by on v1 1/1
#2 lore raw
In reply to Andrew Jones

Hi Drew,

Quoted 39 lines · Andrew Jones

As commit ("scripts: Add 'test_args' test definition parameter") states in its summary, it adds another parameter. Make sure we account for it in the s390x-specific arch_cmd as well.

Fixes a7794f16c84a ("scripts: Add 'test_args' test definition parameter")
---
 scripts/s390x/func.bash | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)
scripts/s390x/func.bash +8 -7
index f04e8e2ac0a7..28c3a70c7da9 100644
@@ -11,15 +11,16 @@ function arch_cmd_s390x()
 	local groups=$3
 	local smp=$4
 	local kernel=$5
-	local opts=$6
-	local arch=$7
-	local machine=$8
-	local check=$9
-	local accel=${10}
-	local timeout=${11}
+	local test_args=$6
+	local opts=$7
+	local arch=$8
+	local machine=$9
+	local check=${10}
+	local accel=${11}
+	local timeout=${12}
 
 	# run the normal test case
-	"$cmd" "$testname" "$groups" "$smp" "$kernel" "$opts" "$arch" "$machine" "$check" "$accel" "$timeout"
+	"$cmd" "$testname" "$groups" "$smp" "$kernel" "$test_args" "$opts" "$arch" "$machine" "$check" "$accel" "$timeout"
 
 	# run PV test case
 	if [ "$accel" = 'tcg' ] || grep -q "migration" <<< "$groups"; then

scripts/s390x/func.bash function arch_cmd_s390x() · line 40

Quoted 6 lines
scripts/s390x/func.bash +1 -1
@@ -35,5 +36,5 @@ function arch_cmd_s390x()
 		print_result 'SKIP' $testname '' 'PVM image was not created'
 		return 2
 	fi
-	"$cmd" "$testname" "$groups pv" "$smp" "$kernel" "$opts" "$arch" "$machine" "$check" "$accel" "$timeout"
+	"$cmd" "$testname" "$groups pv" "$smp" "$kernel" "$test_args" "$opts" "$arch" "$machine" "$check" "$accel" "$timeout"
 }

My bad, I vaguely remember having this change in an earlier version of kvmtool support, but I must have dropped it at some point.

Looks correct to me, it matches the arguments from for_each_unittest():

Thanks,
Alex

#3 lore raw
In reply to Andrew Jones
Quoted 48 lines · Andrew Jones

As commit ("scripts: Add 'test_args' test definition parameter") states in its summary, it adds another parameter. Make sure we account for it in the s390x-specific arch_cmd as well.

Fixes a7794f16c84a ("scripts: Add 'test_args' test definition parameter")
---
 scripts/s390x/func.bash | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)
scripts/s390x/func.bash +9 -8
index f04e8e2ac0a7..28c3a70c7da9 100644
@@ -11,15 +11,16 @@ function arch_cmd_s390x()
 	local groups=$3
 	local smp=$4
 	local kernel=$5
-	local opts=$6
-	local arch=$7
-	local machine=$8
-	local check=$9
-	local accel=${10}
-	local timeout=${11}
+	local test_args=$6
+	local opts=$7
+	local arch=$8
+	local machine=$9
+	local check=${10}
+	local accel=${11}
+	local timeout=${12}
 
 	# run the normal test case
-	"$cmd" "$testname" "$groups" "$smp" "$kernel" "$opts" "$arch" "$machine" "$check" "$accel" "$timeout"
+	"$cmd" "$testname" "$groups" "$smp" "$kernel" "$test_args" "$opts" "$arch" "$machine" "$check" "$accel" "$timeout"
 
 	# run PV test case
 	if [ "$accel" = 'tcg' ] || grep -q "migration" <<< "$groups"; then
@@ -35,5 +36,5 @@ function arch_cmd_s390x()
 		print_result 'SKIP' $testname '' 'PVM image was not created'
 		return 2
 	fi
-	"$cmd" "$testname" "$groups pv" "$smp" "$kernel" "$opts" "$arch" "$machine" "$check" "$accel" "$timeout"
+	"$cmd" "$testname" "$groups pv" "$smp" "$kernel" "$test_args" "$opts" "$arch" "$machine" "$check" "$accel" "$timeout"
 }
Signature · 1 line
2.49.0

Merged.