Fix pbench-linpack options handling bug - backport to b0.71

ndokos · webbnh · commit 1c924215d73c · 2022-06-29T09:27:04.000-04:00
This is a backport of #2926 to b0.71. Fixes #2924. Remove extra shift. Add a simple test. (The invocation is a bit complicated: it's supposed to be a remote invocation to check for the existence of an executable, so it needs to be told where the "installation" directory is.)
diff --git a/agent/bench-scripts/pbench-linpack b/agent/bench-scripts/pbench-linpack
@@ -109,7 +109,6 @@ while true; do
 		exit 0
 		;;
 	--)
-		shift
 		break
 		;;
 	*)
diff --git a/agent/bench-scripts/tests/pbench-linpack/test-68.env b/agent/bench-scripts/tests/pbench-linpack/test-68.env
@@ -0,0 +1 @@
+test-66.env
diff --git a/agent/bench-scripts/tests/pbench-linpack/test-68.opts b/agent/bench-scripts/tests/pbench-linpack/test-68.opts
@@ -0,0 +1 @@
+--pre-check-only 11.1.3 ${PBENCH_LINPACK_INSTALL_PREFIX_DIR}
diff --git a/agent/bench-scripts/tests/pbench-linpack/test-68.pre b/agent/bench-scripts/tests/pbench-linpack/test-68.pre
@@ -0,0 +1 @@
+test-66.pre
diff --git a/agent/bench-scripts/tests/pbench-linpack/test-68.txt b/agent/bench-scripts/tests/pbench-linpack/test-68.txt
@@ -0,0 +1,11 @@
++++ Running test-68 pbench-linpack
+--- Finished test-68 pbench-linpack (status=0)
++++ pbench tree state
+/var/tmp/pbench-test-bench/pbench-agent
+/var/tmp/pbench-test-bench/pbench-agent/tmp
+/var/tmp/pbench-test-bench/pbench-agent/tools-v1-default
+/var/tmp/pbench-test-bench/pbench-agent/tools-v1-default/__trigger__
+/var/tmp/pbench-test-bench/pbench-agent/tools-v1-default/testhost.example.com
+/var/tmp/pbench-test-bench/pbench-agent/tools-v1-default/testhost.example.com/mpstat
+/var/tmp/pbench-test-bench/pbench-agent/tools-v1-default/testhost.example.com/sar
+--- pbench tree state

-Original file line number
+Diff line change
 		exit 0
 		;;
 	--)
 -		shift
 		break
 		;;
 	*)
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+--pre-check-only 11.1.3 ${PBENCH_LINPACK_INSTALL_PREFIX_DIR}`