From 0f12276ecc157c83a9742df5084fbde82f2b8168 Mon Sep 17 00:00:00 2001 From: Nick Dokos Date: Tue, 28 Jun 2022 16:28:35 -0400 Subject: [PATCH] Fix pbench-linpack options handling bug (#2926) Remove extra shift. Fixes #2924. 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.) --- agent/bench-scripts/pbench-linpack | 1 - agent/bench-scripts/tests/pbench-linpack/test-68.env | 1 + agent/bench-scripts/tests/pbench-linpack/test-68.opts | 1 + agent/bench-scripts/tests/pbench-linpack/test-68.pre | 1 + agent/bench-scripts/tests/pbench-linpack/test-68.txt | 11 +++++++++++ 5 files changed, 14 insertions(+), 1 deletion(-) create mode 120000 agent/bench-scripts/tests/pbench-linpack/test-68.env create mode 100644 agent/bench-scripts/tests/pbench-linpack/test-68.opts create mode 120000 agent/bench-scripts/tests/pbench-linpack/test-68.pre create mode 100644 agent/bench-scripts/tests/pbench-linpack/test-68.txt diff --git a/agent/bench-scripts/pbench-linpack b/agent/bench-scripts/pbench-linpack index 3d403f2f0c..ca2c30bc81 100755 --- 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 new file mode 120000 index 0000000000..4a57494918 --- /dev/null +++ b/agent/bench-scripts/tests/pbench-linpack/test-68.env @@ -0,0 +1 @@ +test-66.env \ No newline at end of file diff --git a/agent/bench-scripts/tests/pbench-linpack/test-68.opts b/agent/bench-scripts/tests/pbench-linpack/test-68.opts new file mode 100644 index 0000000000..6225846989 --- /dev/null +++ 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 new file mode 120000 index 0000000000..95cf015eaa --- /dev/null +++ b/agent/bench-scripts/tests/pbench-linpack/test-68.pre @@ -0,0 +1 @@ +test-66.pre \ No newline at end of file diff --git a/agent/bench-scripts/tests/pbench-linpack/test-68.txt b/agent/bench-scripts/tests/pbench-linpack/test-68.txt new file mode 100644 index 0000000000..0f1a9cedc1 --- /dev/null +++ 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