From d6b2ed968b21450fe0caa495c21c01bd0d84f82d Mon Sep 17 00:00:00 2001 From: Nick Dokos Date: Mon, 3 Jul 2023 17:31:21 -0400 Subject: [PATCH] Clarify what tool-specific options are (#3444) (#3462) Fixes #3443 Modify the help message of base-tool (and everybody who is symlinked to it) to clarify the tool-specific options that may be specified when registering a tool (on the RHS of `--` in the invocation of `pbench-register-tool`). PBENCH-1173 --- agent/tool-scripts/base-tool | 24 +++++++++++-------- agent/tool-scripts/tests/blktrace/gold/stderr | 9 +++---- agent/tool-scripts/tests/bpftrace/gold/stderr | 9 +++---- agent/tool-scripts/tests/cpuacct/gold/stderr | 9 +++---- agent/tool-scripts/tests/disk/gold/stderr | 9 +++---- agent/tool-scripts/tests/dm-cache/gold/stderr | 9 +++---- .../tests/docker-info/gold/stderr | 9 +++---- agent/tool-scripts/tests/docker/gold/stderr | 9 +++---- .../tests/haproxy-ocp/gold/stderr | 9 +++---- agent/tool-scripts/tests/iostat/gold/stderr | 9 +++---- agent/tool-scripts/tests/jmap/gold/stderr | 9 +++---- agent/tool-scripts/tests/jstack/gold/stderr | 9 +++---- .../tests/kvm-spinlock/gold/stderr | 9 +++---- agent/tool-scripts/tests/kvmstat/gold/stderr | 9 +++---- agent/tool-scripts/tests/kvmtrace/gold/stderr | 9 +++---- agent/tool-scripts/tests/lockstat/gold/stderr | 8 +++---- agent/tool-scripts/tests/mpstat/gold/stderr | 9 +++---- agent/tool-scripts/tests/numastat/gold/stderr | 9 +++---- agent/tool-scripts/tests/oc/gold/stderr | 9 +++---- .../tests/openvswitch/gold/stderr | 9 +++---- agent/tool-scripts/tests/perf/gold/stderr | 9 +++---- agent/tool-scripts/tests/pidstat/gold/stderr | 9 +++---- agent/tool-scripts/tests/pprof/gold/stderr | 9 +++---- .../tests/proc-interrupts/gold/stderr | 9 +++---- .../tests/proc-sched_debug/gold/stderr | 9 +++---- .../tests/proc-vmstat/gold/stderr | 9 +++---- .../tests/prometheus-metrics/gold/stderr | 9 +++---- .../tests/qemu-migrate/gold/stderr | 9 +++---- agent/tool-scripts/tests/rabbit/gold/stderr | 9 +++---- agent/tool-scripts/tests/sar/gold/stderr | 9 +++---- agent/tool-scripts/tests/strace/gold/stderr | 9 +++---- agent/tool-scripts/tests/sysfs/gold/stderr | 9 +++---- .../tool-scripts/tests/systemtap/gold/stderr | 9 +++---- agent/tool-scripts/tests/tcpdump/gold/stderr | 9 +++---- .../tool-scripts/tests/turbostat/gold/stderr | 9 +++---- .../tool-scripts/tests/user-tool/gold/stderr | 9 +++---- .../tests/virsh-migrate/gold/stderr | 9 +++---- agent/tool-scripts/tests/vmstat/gold/stderr | 9 +++---- .../gold/pbench-register-tool/test-44.txt | 1 + .../gold/pbench-register-tool/test-46.txt | 1 + .../gold/pbench-register-tool/test-47.txt | 1 + agent/util-scripts/pbench-register-tool | 3 ++- 42 files changed, 130 insertions(+), 232 deletions(-) diff --git a/agent/tool-scripts/base-tool b/agent/tool-scripts/base-tool index 61f42ea158..d10c1da00e 100755 --- a/agent/tool-scripts/base-tool +++ b/agent/tool-scripts/base-tool @@ -190,24 +190,29 @@ vmstat) esac function usage { - printf -- "The following options are available:\n\n" - printf -- "\t--install verify this perf tool will work\n\n" - printf -- "\t--start|stop|postprocess start/stop/postprocess the data collection\n" - printf -- "\t-d str|--dir=str directory to store data collection (required)\n" + printf -- "\t-h|--help display this help message and exit\n\n" + + printf -- "\nTool-specific options - these may be specified when you register a tool:\n\n" + case "${tool}" in - blktrace|bpftrace|kvmtrace|lockstat|oc|perf|strace|systemtap|tcpdump) - : # These tools don't use interval + lockstat) + : # Tools that don't take *any* tool-specific options + printf -- "\tNo tool-specific options for this tool\n" + ;; + blktrace|bpftrace|kvmtrace|oc|perf|strace|systemtap|tcpdump) + : # Tools that don't use '--interval' but take other tool-specific options ;; *) printf -- "\t--interval=int number of seconds between each data collection (optional, default is %s seconds)\n" "${def_interval}" ;; esac + case "${tool}" in blktrace) - printf -- "\t--devices=str,[str] the list of block devices to trace (required w/ --start)\n" + printf -- "\t--devices=str,[str] the list of block devices to trace (required)\n" ;; bpftrace) - printf -- "\t--script=str path to the bpftrace script (required w/ --start)\n" + printf -- "\t--script=str path to the bpftrace script (required)\n" ;; haproxy-ocp) printf -- "\t--counters-clear-all clear all HAProxy counters at tool start (optional, default: '%s')\n" "${def_counters_clear_all}" @@ -278,7 +283,6 @@ function usage { printf -- "\t but not both at the same time\n" ;; esac - printf -- "\n\t-h|--help display this help message\n" } # Process options and arguments @@ -582,7 +586,7 @@ install) local _installed_rpm local _rc _installed_rpm="$(require-rpm "${_tpn}" "${_tpv}")" - _rc=${?} + _rc=${?} if [[ ${_rc} != 0 ]]; then printf -- "%s: %s is not installed\n" "${tool}" "${_tpn}${_tpv:+-${_tpv}}" >&2 else diff --git a/agent/tool-scripts/tests/blktrace/gold/stderr b/agent/tool-scripts/tests/blktrace/gold/stderr index 0035b002b4..3aef559b63 100644 --- a/agent/tool-scripts/tests/blktrace/gold/stderr +++ b/agent/tool-scripts/tests/blktrace/gold/stderr @@ -1,13 +1,10 @@ blktrace: Error, one of the following options is required, --install|--start|--stop|--postprocess -The following options are available: + -h|--help display this help message and exit - --install verify this perf tool will work - --start|stop|postprocess start/stop/postprocess the data collection - -d str|--dir=str directory to store data collection (required) - --devices=str,[str] the list of block devices to trace (required w/ --start) +Tool-specific options - these may be specified when you register a tool: - -h|--help display this help message + --devices=str,[str] the list of block devices to trace (required) blktrace: WARNING - postprocess - tool output directory, '/var/tmp/pbench-test-tool-scripts/blktrace/tools-group/blktrace', missing blktrace: WARNING - stop - tool output directory, '/var/tmp/pbench-test-tool-scripts/blktrace/tools-group/blktrace', missing diff --git a/agent/tool-scripts/tests/bpftrace/gold/stderr b/agent/tool-scripts/tests/bpftrace/gold/stderr index 5a8d218c6c..9a78778bf7 100644 --- a/agent/tool-scripts/tests/bpftrace/gold/stderr +++ b/agent/tool-scripts/tests/bpftrace/gold/stderr @@ -1,13 +1,10 @@ bpftrace: Error, one of the following options is required, --install|--start|--stop|--postprocess -The following options are available: + -h|--help display this help message and exit - --install verify this perf tool will work - --start|stop|postprocess start/stop/postprocess the data collection - -d str|--dir=str directory to store data collection (required) - --script=str path to the bpftrace script (required w/ --start) +Tool-specific options - these may be specified when you register a tool: - -h|--help display this help message + --script=str path to the bpftrace script (required) bpftrace: WARNING - postprocess - tool output directory, '/var/tmp/pbench-test-tool-scripts/bpftrace/tools-group/bpftrace', missing bpftrace: WARNING - stop - tool output directory, '/var/tmp/pbench-test-tool-scripts/bpftrace/tools-group/bpftrace', missing diff --git a/agent/tool-scripts/tests/cpuacct/gold/stderr b/agent/tool-scripts/tests/cpuacct/gold/stderr index 3f5a10e7d5..aafa04b692 100644 --- a/agent/tool-scripts/tests/cpuacct/gold/stderr +++ b/agent/tool-scripts/tests/cpuacct/gold/stderr @@ -1,13 +1,10 @@ cpuacct: Error, one of the following options is required, --install|--start|--stop|--postprocess -The following options are available: + -h|--help display this help message and exit - --install verify this perf tool will work - --start|stop|postprocess start/stop/postprocess the data collection - -d str|--dir=str directory to store data collection (required) - --interval=int number of seconds between each data collection (optional, default is 10 seconds) +Tool-specific options - these may be specified when you register a tool: - -h|--help display this help message + --interval=int number of seconds between each data collection (optional, default is 10 seconds) cpuacct: WARNING - postprocess - tool output directory, '/var/tmp/pbench-test-tool-scripts/cpuacct/tools-group/cpuacct', missing cpuacct: WARNING - stop - tool output directory, '/var/tmp/pbench-test-tool-scripts/cpuacct/tools-group/cpuacct', missing diff --git a/agent/tool-scripts/tests/disk/gold/stderr b/agent/tool-scripts/tests/disk/gold/stderr index 99ca48205a..dabf8ab3df 100644 --- a/agent/tool-scripts/tests/disk/gold/stderr +++ b/agent/tool-scripts/tests/disk/gold/stderr @@ -1,13 +1,10 @@ disk: Error, one of the following options is required, --install|--start|--stop|--postprocess -The following options are available: + -h|--help display this help message and exit - --install verify this perf tool will work - --start|stop|postprocess start/stop/postprocess the data collection - -d str|--dir=str directory to store data collection (required) - --interval=int number of seconds between each data collection (optional, default is 10 seconds) +Tool-specific options - these may be specified when you register a tool: - -h|--help display this help message + --interval=int number of seconds between each data collection (optional, default is 10 seconds) disk: WARNING - postprocess - tool output directory, '/var/tmp/pbench-test-tool-scripts/disk/tools-group/disk', missing disk: WARNING - stop - tool output directory, '/var/tmp/pbench-test-tool-scripts/disk/tools-group/disk', missing diff --git a/agent/tool-scripts/tests/dm-cache/gold/stderr b/agent/tool-scripts/tests/dm-cache/gold/stderr index 3253bd6abd..18c64ef0ef 100644 --- a/agent/tool-scripts/tests/dm-cache/gold/stderr +++ b/agent/tool-scripts/tests/dm-cache/gold/stderr @@ -1,13 +1,10 @@ dm-cache: Error, one of the following options is required, --install|--start|--stop|--postprocess -The following options are available: + -h|--help display this help message and exit - --install verify this perf tool will work - --start|stop|postprocess start/stop/postprocess the data collection - -d str|--dir=str directory to store data collection (required) - --interval=int number of seconds between each data collection (optional, default is 10 seconds) +Tool-specific options - these may be specified when you register a tool: - -h|--help display this help message + --interval=int number of seconds between each data collection (optional, default is 10 seconds) dm-cache: WARNING - postprocess - tool output directory, '/var/tmp/pbench-test-tool-scripts/dm-cache/tools-group/dm-cache', missing dm-cache: WARNING - stop - tool output directory, '/var/tmp/pbench-test-tool-scripts/dm-cache/tools-group/dm-cache', missing diff --git a/agent/tool-scripts/tests/docker-info/gold/stderr b/agent/tool-scripts/tests/docker-info/gold/stderr index cd4eba3a9d..998b9b009a 100644 --- a/agent/tool-scripts/tests/docker-info/gold/stderr +++ b/agent/tool-scripts/tests/docker-info/gold/stderr @@ -1,13 +1,10 @@ docker-info: Error, one of the following options is required, --install|--start|--stop|--postprocess -The following options are available: + -h|--help display this help message and exit - --install verify this perf tool will work - --start|stop|postprocess start/stop/postprocess the data collection - -d str|--dir=str directory to store data collection (required) - --interval=int number of seconds between each data collection (optional, default is 10 seconds) +Tool-specific options - these may be specified when you register a tool: - -h|--help display this help message + --interval=int number of seconds between each data collection (optional, default is 10 seconds) docker-info: WARNING - postprocess - tool output directory, '/var/tmp/pbench-test-tool-scripts/docker-info/tools-group/docker-info', missing docker-info: WARNING - stop - tool output directory, '/var/tmp/pbench-test-tool-scripts/docker-info/tools-group/docker-info', missing diff --git a/agent/tool-scripts/tests/docker/gold/stderr b/agent/tool-scripts/tests/docker/gold/stderr index 4faa9f7648..0020e78f7c 100644 --- a/agent/tool-scripts/tests/docker/gold/stderr +++ b/agent/tool-scripts/tests/docker/gold/stderr @@ -1,13 +1,10 @@ docker: Error, one of the following options is required, --install|--start|--stop|--postprocess -The following options are available: + -h|--help display this help message and exit - --install verify this perf tool will work - --start|stop|postprocess start/stop/postprocess the data collection - -d str|--dir=str directory to store data collection (required) - --interval=int number of seconds between each data collection (optional, default is 10 seconds) +Tool-specific options - these may be specified when you register a tool: - -h|--help display this help message + --interval=int number of seconds between each data collection (optional, default is 10 seconds) docker: WARNING - postprocess - tool output directory, '/var/tmp/pbench-test-tool-scripts/docker/tools-group/docker', missing docker: WARNING - stop - tool output directory, '/var/tmp/pbench-test-tool-scripts/docker/tools-group/docker', missing diff --git a/agent/tool-scripts/tests/haproxy-ocp/gold/stderr b/agent/tool-scripts/tests/haproxy-ocp/gold/stderr index d898ab3320..3599ee282e 100644 --- a/agent/tool-scripts/tests/haproxy-ocp/gold/stderr +++ b/agent/tool-scripts/tests/haproxy-ocp/gold/stderr @@ -1,14 +1,11 @@ haproxy-ocp: Error, one of the following options is required, --install|--start|--stop|--postprocess -The following options are available: + -h|--help display this help message and exit - --install verify this perf tool will work - --start|stop|postprocess start/stop/postprocess the data collection - -d str|--dir=str directory to store data collection (required) +Tool-specific options - these may be specified when you register a tool: + --interval=int number of seconds between each data collection (optional, default is 10 seconds) --counters-clear-all clear all HAProxy counters at tool start (optional, default: 'false') - - -h|--help display this help message haproxy-ocp: WARNING - postprocess - tool output directory, '/var/tmp/pbench-test-tool-scripts/haproxy-ocp/tools-group/haproxy-ocp', missing haproxy-ocp: WARNING - stop - tool output directory, '/var/tmp/pbench-test-tool-scripts/haproxy-ocp/tools-group/haproxy-ocp', missing diff --git a/agent/tool-scripts/tests/iostat/gold/stderr b/agent/tool-scripts/tests/iostat/gold/stderr index 1b5e3dfd0b..1bc2d3b57e 100644 --- a/agent/tool-scripts/tests/iostat/gold/stderr +++ b/agent/tool-scripts/tests/iostat/gold/stderr @@ -1,14 +1,11 @@ iostat: Error, one of the following options is required, --install|--start|--stop|--postprocess -The following options are available: + -h|--help display this help message and exit - --install verify this perf tool will work - --start|stop|postprocess start/stop/postprocess the data collection - -d str|--dir=str directory to store data collection (required) +Tool-specific options - these may be specified when you register a tool: + --interval=int number of seconds between each data collection (optional, default is 10 seconds) --options=str options passed directly to the tool (optional) - - -h|--help display this help message iostat: WARNING - postprocess - tool output directory, '/var/tmp/pbench-test-tool-scripts/iostat/tools-group/iostat', missing iostat: WARNING - stop - tool output directory, '/var/tmp/pbench-test-tool-scripts/iostat/tools-group/iostat', missing diff --git a/agent/tool-scripts/tests/jmap/gold/stderr b/agent/tool-scripts/tests/jmap/gold/stderr index e12fa08f83..190353fa09 100644 --- a/agent/tool-scripts/tests/jmap/gold/stderr +++ b/agent/tool-scripts/tests/jmap/gold/stderr @@ -1,15 +1,12 @@ jmap: Error, one of the following options is required, --install|--start|--stop|--postprocess -The following options are available: + -h|--help display this help message and exit - --install verify this perf tool will work - --start|stop|postprocess start/stop/postprocess the data collection - -d str|--dir=str directory to store data collection (required) +Tool-specific options - these may be specified when you register a tool: + --interval=int number of seconds between each data collection (optional, default is 10 seconds) --pid=int a process ID to jmap --pattern=str jmap any PID which name matches this string (via pgrep) - - -h|--help display this help message jmap: WARNING - postprocess - tool output directory, '/var/tmp/pbench-test-tool-scripts/jmap/tools-group/jmap', missing jmap: WARNING - stop - tool output directory, '/var/tmp/pbench-test-tool-scripts/jmap/tools-group/jmap', missing diff --git a/agent/tool-scripts/tests/jstack/gold/stderr b/agent/tool-scripts/tests/jstack/gold/stderr index 2cb463e0cb..2cba059beb 100644 --- a/agent/tool-scripts/tests/jstack/gold/stderr +++ b/agent/tool-scripts/tests/jstack/gold/stderr @@ -1,15 +1,12 @@ jstack: Error, one of the following options is required, --install|--start|--stop|--postprocess -The following options are available: + -h|--help display this help message and exit - --install verify this perf tool will work - --start|stop|postprocess start/stop/postprocess the data collection - -d str|--dir=str directory to store data collection (required) +Tool-specific options - these may be specified when you register a tool: + --interval=int number of seconds between each data collection (optional, default is 10 seconds) --pid=int a process ID to jstack --pattern=str jstack any PID which name matches this string (via pgrep) - - -h|--help display this help message jstack: WARNING - postprocess - tool output directory, '/var/tmp/pbench-test-tool-scripts/jstack/tools-group/jstack', missing jstack: WARNING - stop - tool output directory, '/var/tmp/pbench-test-tool-scripts/jstack/tools-group/jstack', missing diff --git a/agent/tool-scripts/tests/kvm-spinlock/gold/stderr b/agent/tool-scripts/tests/kvm-spinlock/gold/stderr index 98f1360e93..21df515bf0 100644 --- a/agent/tool-scripts/tests/kvm-spinlock/gold/stderr +++ b/agent/tool-scripts/tests/kvm-spinlock/gold/stderr @@ -1,13 +1,10 @@ kvm-spinlock: Error, one of the following options is required, --install|--start|--stop|--postprocess -The following options are available: + -h|--help display this help message and exit - --install verify this perf tool will work - --start|stop|postprocess start/stop/postprocess the data collection - -d str|--dir=str directory to store data collection (required) - --interval=int number of seconds between each data collection (optional, default is 10 seconds) +Tool-specific options - these may be specified when you register a tool: - -h|--help display this help message + --interval=int number of seconds between each data collection (optional, default is 10 seconds) kvm-spinlock: WARNING - postprocess - tool output directory, '/var/tmp/pbench-test-tool-scripts/kvm-spinlock/tools-group/kvm-spinlock', missing kvm-spinlock: WARNING - stop - tool output directory, '/var/tmp/pbench-test-tool-scripts/kvm-spinlock/tools-group/kvm-spinlock', missing diff --git a/agent/tool-scripts/tests/kvmstat/gold/stderr b/agent/tool-scripts/tests/kvmstat/gold/stderr index 28f5a8d3e9..e9c8a72f2a 100644 --- a/agent/tool-scripts/tests/kvmstat/gold/stderr +++ b/agent/tool-scripts/tests/kvmstat/gold/stderr @@ -1,13 +1,10 @@ kvmstat: Error, one of the following options is required, --install|--start|--stop|--postprocess -The following options are available: + -h|--help display this help message and exit - --install verify this perf tool will work - --start|stop|postprocess start/stop/postprocess the data collection - -d str|--dir=str directory to store data collection (required) - --interval=int number of seconds between each data collection (optional, default is 10 seconds) +Tool-specific options - these may be specified when you register a tool: - -h|--help display this help message + --interval=int number of seconds between each data collection (optional, default is 10 seconds) kvmstat: WARNING - postprocess - tool output directory, '/var/tmp/pbench-test-tool-scripts/kvmstat/tools-group/kvmstat', missing kvmstat: WARNING - stop - tool output directory, '/var/tmp/pbench-test-tool-scripts/kvmstat/tools-group/kvmstat', missing diff --git a/agent/tool-scripts/tests/kvmtrace/gold/stderr b/agent/tool-scripts/tests/kvmtrace/gold/stderr index 565e5c1d0b..903346fd78 100644 --- a/agent/tool-scripts/tests/kvmtrace/gold/stderr +++ b/agent/tool-scripts/tests/kvmtrace/gold/stderr @@ -1,16 +1,13 @@ kvmtrace: Error, one of the following options is required, --install|--start|--stop|--postprocess -The following options are available: + -h|--help display this help message and exit - --install verify this perf tool will work - --start|stop|postprocess start/stop/postprocess the data collection - -d str|--dir=str directory to store data collection (required) +Tool-specific options - these may be specified when you register a tool: + --vm=str the hostname of the vm running (to get kallsyms) --timeout=int how long the trace will run (default is 1 second) If 0 is used, the trace will not stop until stop-tools is called --start-delay=int sleep this many seconds before starting the trace (default is 0 seconds) - - -h|--help display this help message kvmtrace: WARNING - postprocess - tool output directory, '/var/tmp/pbench-test-tool-scripts/kvmtrace/tools-group/kvmtrace', missing kvmtrace: WARNING - stop - tool output directory, '/var/tmp/pbench-test-tool-scripts/kvmtrace/tools-group/kvmtrace', missing diff --git a/agent/tool-scripts/tests/lockstat/gold/stderr b/agent/tool-scripts/tests/lockstat/gold/stderr index 72670a3708..e66c5dc7c1 100644 --- a/agent/tool-scripts/tests/lockstat/gold/stderr +++ b/agent/tool-scripts/tests/lockstat/gold/stderr @@ -1,12 +1,10 @@ lockstat: Error, one of the following options is required, --install|--start|--stop|--postprocess -The following options are available: + -h|--help display this help message and exit - --install verify this perf tool will work - --start|stop|postprocess start/stop/postprocess the data collection - -d str|--dir=str directory to store data collection (required) +Tool-specific options - these may be specified when you register a tool: - -h|--help display this help message + No tool-specific options for this tool lockstat: WARNING - postprocess - tool output directory, '/var/tmp/pbench-test-tool-scripts/lockstat/tools-group/lockstat', missing lockstat: WARNING - stop - tool output directory, '/var/tmp/pbench-test-tool-scripts/lockstat/tools-group/lockstat', missing diff --git a/agent/tool-scripts/tests/mpstat/gold/stderr b/agent/tool-scripts/tests/mpstat/gold/stderr index 1f15a77068..2da95bd371 100644 --- a/agent/tool-scripts/tests/mpstat/gold/stderr +++ b/agent/tool-scripts/tests/mpstat/gold/stderr @@ -1,14 +1,11 @@ mpstat: Error, one of the following options is required, --install|--start|--stop|--postprocess -The following options are available: + -h|--help display this help message and exit - --install verify this perf tool will work - --start|stop|postprocess start/stop/postprocess the data collection - -d str|--dir=str directory to store data collection (required) +Tool-specific options - these may be specified when you register a tool: + --interval=int number of seconds between each data collection (optional, default is 10 seconds) --options=str options passed directly to the tool (optional) - - -h|--help display this help message mpstat: WARNING - postprocess - tool output directory, '/var/tmp/pbench-test-tool-scripts/mpstat/tools-group/mpstat', missing mpstat: WARNING - stop - tool output directory, '/var/tmp/pbench-test-tool-scripts/mpstat/tools-group/mpstat', missing diff --git a/agent/tool-scripts/tests/numastat/gold/stderr b/agent/tool-scripts/tests/numastat/gold/stderr index 462a2b19c9..b8b5efd7c0 100644 --- a/agent/tool-scripts/tests/numastat/gold/stderr +++ b/agent/tool-scripts/tests/numastat/gold/stderr @@ -1,14 +1,11 @@ numastat: Error, one of the following options is required, --install|--start|--stop|--postprocess -The following options are available: + -h|--help display this help message and exit - --install verify this perf tool will work - --start|stop|postprocess start/stop/postprocess the data collection - -d str|--dir=str directory to store data collection (required) +Tool-specific options - these may be specified when you register a tool: + --interval=int number of seconds between each data collection (optional, default is 10 seconds) --pattern=str a pattern for matching which processes for reporting per-node memory allocation - - -h|--help display this help message numastat: WARNING - postprocess - tool output directory, '/var/tmp/pbench-test-tool-scripts/numastat/tools-group/numastat', missing numastat: WARNING - stop - tool output directory, '/var/tmp/pbench-test-tool-scripts/numastat/tools-group/numastat', missing diff --git a/agent/tool-scripts/tests/oc/gold/stderr b/agent/tool-scripts/tests/oc/gold/stderr index 0c20261da8..e578ac9b5d 100644 --- a/agent/tool-scripts/tests/oc/gold/stderr +++ b/agent/tool-scripts/tests/oc/gold/stderr @@ -1,13 +1,10 @@ oc: Error, one of the following options is required, --install|--start|--stop|--postprocess -The following options are available: + -h|--help display this help message and exit - --install verify this perf tool will work - --start|stop|postprocess start/stop/postprocess the data collection - -d str|--dir=str directory to store data collection (required) - --components=str[,str] one or more OpenShift component names suitable for use with "oc get" (optional, default: 'rc,ep,pods,pv,pvc,svc,cs') +Tool-specific options - these may be specified when you register a tool: - -h|--help display this help message + --components=str[,str] one or more OpenShift component names suitable for use with "oc get" (optional, default: 'rc,ep,pods,pv,pvc,svc,cs') oc: WARNING - postprocess - tool output directory, '/var/tmp/pbench-test-tool-scripts/oc/tools-group/oc', missing oc: WARNING - stop - tool output directory, '/var/tmp/pbench-test-tool-scripts/oc/tools-group/oc', missing diff --git a/agent/tool-scripts/tests/openvswitch/gold/stderr b/agent/tool-scripts/tests/openvswitch/gold/stderr index c45021acc0..6f736add19 100644 --- a/agent/tool-scripts/tests/openvswitch/gold/stderr +++ b/agent/tool-scripts/tests/openvswitch/gold/stderr @@ -1,13 +1,10 @@ openvswitch: Error, one of the following options is required, --install|--start|--stop|--postprocess -The following options are available: + -h|--help display this help message and exit - --install verify this perf tool will work - --start|stop|postprocess start/stop/postprocess the data collection - -d str|--dir=str directory to store data collection (required) - --interval=int number of seconds between each data collection (optional, default is 10 seconds) +Tool-specific options - these may be specified when you register a tool: - -h|--help display this help message + --interval=int number of seconds between each data collection (optional, default is 10 seconds) openvswitch: WARNING - postprocess - tool output directory, '/var/tmp/pbench-test-tool-scripts/openvswitch/tools-group/openvswitch', missing openvswitch: WARNING - stop - tool output directory, '/var/tmp/pbench-test-tool-scripts/openvswitch/tools-group/openvswitch', missing diff --git a/agent/tool-scripts/tests/perf/gold/stderr b/agent/tool-scripts/tests/perf/gold/stderr index 12e215ddcf..b3b841de3f 100644 --- a/agent/tool-scripts/tests/perf/gold/stderr +++ b/agent/tool-scripts/tests/perf/gold/stderr @@ -1,15 +1,12 @@ perf: Error, one of the following options is required, --install|--start|--stop|--postprocess -The following options are available: + -h|--help display this help message and exit - --install verify this perf tool will work - --start|stop|postprocess start/stop/postprocess the data collection - -d str|--dir=str directory to store data collection (required) +Tool-specific options - these may be specified when you register a tool: + -r str|--record-opts=str options one would use to record perf data (optional, default: '-a --freq=100') -p str|--report-opts=str options one would use to report perf data (optional, default: '--show-nr-samples -I') --callgraph generate a call graph by adding '-g' to the record and report options - - -h|--help display this help message perf: WARNING - postprocess - tool output directory, '/var/tmp/pbench-test-tool-scripts/perf/tools-group/perf', missing perf: WARNING - stop - tool output directory, '/var/tmp/pbench-test-tool-scripts/perf/tools-group/perf', missing diff --git a/agent/tool-scripts/tests/pidstat/gold/stderr b/agent/tool-scripts/tests/pidstat/gold/stderr index d37ff5e817..209a43a473 100644 --- a/agent/tool-scripts/tests/pidstat/gold/stderr +++ b/agent/tool-scripts/tests/pidstat/gold/stderr @@ -1,11 +1,10 @@ pidstat: Error, one of the following options is required, --install|--start|--stop|--postprocess -The following options are available: + -h|--help display this help message and exit - --install verify this perf tool will work - --start|stop|postprocess start/stop/postprocess the data collection - -d str|--dir=str directory to store data collection (required) +Tool-specific options - these may be specified when you register a tool: + --interval=int number of seconds between each data collection (optional, default is 10 seconds) --options=str options passed directly to the tool --patterns=str[,str] only collect information on process names @@ -13,7 +12,5 @@ The following options are available: patterns with special characters may not work) for kvm, use --patterns=qemu,vhost --threads collect per-thread statistics - - -h|--help display this help message pidstat: WARNING - postprocess - tool output directory, '/var/tmp/pbench-test-tool-scripts/pidstat/tools-group/pidstat', missing pidstat: WARNING - stop - tool output directory, '/var/tmp/pbench-test-tool-scripts/pidstat/tools-group/pidstat', missing diff --git a/agent/tool-scripts/tests/pprof/gold/stderr b/agent/tool-scripts/tests/pprof/gold/stderr index b5f5a49318..56df9ad75f 100644 --- a/agent/tool-scripts/tests/pprof/gold/stderr +++ b/agent/tool-scripts/tests/pprof/gold/stderr @@ -1,16 +1,13 @@ pprof: Error, one of the following options is required, --install|--start|--stop|--postprocess -The following options are available: + -h|--help display this help message and exit - --install verify this perf tool will work - --start|stop|postprocess start/stop/postprocess the data collection - -d str|--dir=str directory to store data collection (required) +Tool-specific options - these may be specified when you register a tool: + --interval=int number of seconds between each data collection (optional, default is 60 seconds) --gopath=str path to the Go directory containing a 'bin' directory (required) --goroot=str path to the Go installation directory (optional) --inventory=str path to the inventory file (required) - - -h|--help display this help message pprof: WARNING - postprocess - tool output directory, '/var/tmp/pbench-test-tool-scripts/pprof/tools-group/pprof', missing pprof: WARNING - stop - tool output directory, '/var/tmp/pbench-test-tool-scripts/pprof/tools-group/pprof', missing diff --git a/agent/tool-scripts/tests/proc-interrupts/gold/stderr b/agent/tool-scripts/tests/proc-interrupts/gold/stderr index 9965b1aab7..fb10a6c76b 100644 --- a/agent/tool-scripts/tests/proc-interrupts/gold/stderr +++ b/agent/tool-scripts/tests/proc-interrupts/gold/stderr @@ -1,13 +1,10 @@ proc-interrupts: Error, one of the following options is required, --install|--start|--stop|--postprocess -The following options are available: + -h|--help display this help message and exit - --install verify this perf tool will work - --start|stop|postprocess start/stop/postprocess the data collection - -d str|--dir=str directory to store data collection (required) - --interval=int number of seconds between each data collection (optional, default is 10 seconds) +Tool-specific options - these may be specified when you register a tool: - -h|--help display this help message + --interval=int number of seconds between each data collection (optional, default is 10 seconds) proc-interrupts: WARNING - postprocess - tool output directory, '/var/tmp/pbench-test-tool-scripts/proc-interrupts/tools-group/proc-interrupts', missing proc-interrupts: WARNING - stop - tool output directory, '/var/tmp/pbench-test-tool-scripts/proc-interrupts/tools-group/proc-interrupts', missing diff --git a/agent/tool-scripts/tests/proc-sched_debug/gold/stderr b/agent/tool-scripts/tests/proc-sched_debug/gold/stderr index 6c76cb18d0..d9dfeb430b 100644 --- a/agent/tool-scripts/tests/proc-sched_debug/gold/stderr +++ b/agent/tool-scripts/tests/proc-sched_debug/gold/stderr @@ -1,13 +1,10 @@ proc-sched_debug: Error, one of the following options is required, --install|--start|--stop|--postprocess -The following options are available: + -h|--help display this help message and exit - --install verify this perf tool will work - --start|stop|postprocess start/stop/postprocess the data collection - -d str|--dir=str directory to store data collection (required) - --interval=int number of seconds between each data collection (optional, default is 10 seconds) +Tool-specific options - these may be specified when you register a tool: - -h|--help display this help message + --interval=int number of seconds between each data collection (optional, default is 10 seconds) proc-sched_debug: WARNING - postprocess - tool output directory, '/var/tmp/pbench-test-tool-scripts/proc-sched_debug/tools-group/proc-sched_debug', missing proc-sched_debug: WARNING - stop - tool output directory, '/var/tmp/pbench-test-tool-scripts/proc-sched_debug/tools-group/proc-sched_debug', missing diff --git a/agent/tool-scripts/tests/proc-vmstat/gold/stderr b/agent/tool-scripts/tests/proc-vmstat/gold/stderr index c23a14b501..edd7eb277f 100644 --- a/agent/tool-scripts/tests/proc-vmstat/gold/stderr +++ b/agent/tool-scripts/tests/proc-vmstat/gold/stderr @@ -1,13 +1,10 @@ proc-vmstat: Error, one of the following options is required, --install|--start|--stop|--postprocess -The following options are available: + -h|--help display this help message and exit - --install verify this perf tool will work - --start|stop|postprocess start/stop/postprocess the data collection - -d str|--dir=str directory to store data collection (required) - --interval=int number of seconds between each data collection (optional, default is 10 seconds) +Tool-specific options - these may be specified when you register a tool: - -h|--help display this help message + --interval=int number of seconds between each data collection (optional, default is 10 seconds) proc-vmstat: WARNING - postprocess - tool output directory, '/var/tmp/pbench-test-tool-scripts/proc-vmstat/tools-group/proc-vmstat', missing proc-vmstat: WARNING - stop - tool output directory, '/var/tmp/pbench-test-tool-scripts/proc-vmstat/tools-group/proc-vmstat', missing diff --git a/agent/tool-scripts/tests/prometheus-metrics/gold/stderr b/agent/tool-scripts/tests/prometheus-metrics/gold/stderr index 32adc72977..236fb8a0b9 100644 --- a/agent/tool-scripts/tests/prometheus-metrics/gold/stderr +++ b/agent/tool-scripts/tests/prometheus-metrics/gold/stderr @@ -1,16 +1,13 @@ prometheus-metrics: Error, one of the following options is required, --install|--start|--stop|--postprocess -The following options are available: + -h|--help display this help message and exit - --install verify this perf tool will work - --start|stop|postprocess start/stop/postprocess the data collection - -d str|--dir=str directory to store data collection (required) +Tool-specific options - these may be specified when you register a tool: + --interval=int number of seconds between each data collection (optional, default is 10 seconds) --gopath=str path to the Go directory containing a 'bin' directory (required) --goroot=str path to the Go installation directory (optional) --inventory=str path to the inventory file (required) - - -h|--help display this help message prometheus-metrics: WARNING - postprocess - tool output directory, '/var/tmp/pbench-test-tool-scripts/prometheus-metrics/tools-group/prometheus-metrics', missing prometheus-metrics: WARNING - stop - tool output directory, '/var/tmp/pbench-test-tool-scripts/prometheus-metrics/tools-group/prometheus-metrics', missing diff --git a/agent/tool-scripts/tests/qemu-migrate/gold/stderr b/agent/tool-scripts/tests/qemu-migrate/gold/stderr index e5c1441111..2412d8603b 100644 --- a/agent/tool-scripts/tests/qemu-migrate/gold/stderr +++ b/agent/tool-scripts/tests/qemu-migrate/gold/stderr @@ -1,14 +1,11 @@ qemu-migrate: Error, one of the following options is required, --install|--start|--stop|--postprocess -The following options are available: + -h|--help display this help message and exit - --install verify this perf tool will work - --start|stop|postprocess start/stop/postprocess the data collection - -d str|--dir=str directory to store data collection (required) +Tool-specific options - these may be specified when you register a tool: + --interval=int number of seconds between each data collection (optional, default is 10 seconds) --vm=str the name of the VM being migrated - - -h|--help display this help message qemu-migrate: WARNING - postprocess - tool output directory, '/var/tmp/pbench-test-tool-scripts/qemu-migrate/tools-group/qemu-migrate', missing qemu-migrate: WARNING - stop - tool output directory, '/var/tmp/pbench-test-tool-scripts/qemu-migrate/tools-group/qemu-migrate', missing diff --git a/agent/tool-scripts/tests/rabbit/gold/stderr b/agent/tool-scripts/tests/rabbit/gold/stderr index b15e7adf43..e2b728f0b6 100644 --- a/agent/tool-scripts/tests/rabbit/gold/stderr +++ b/agent/tool-scripts/tests/rabbit/gold/stderr @@ -1,15 +1,12 @@ rabbit: Error, one of the following options is required, --install|--start|--stop|--postprocess -The following options are available: + -h|--help display this help message and exit - --install verify this perf tool will work - --start|stop|postprocess start/stop/postprocess the data collection - -d str|--dir=str directory to store data collection (required) +Tool-specific options - these may be specified when you register a tool: + --interval=int number of seconds between each data collection (optional, default is 10 seconds) --username=str rabbit user name (default is "guest") --password=str rabbit password (default is "guest") - - -h|--help display this help message rabbit: WARNING - postprocess - tool output directory, '/var/tmp/pbench-test-tool-scripts/rabbit/tools-group/rabbit', missing rabbit: WARNING - stop - tool output directory, '/var/tmp/pbench-test-tool-scripts/rabbit/tools-group/rabbit', missing diff --git a/agent/tool-scripts/tests/sar/gold/stderr b/agent/tool-scripts/tests/sar/gold/stderr index c8e742f856..ca4465e10b 100644 --- a/agent/tool-scripts/tests/sar/gold/stderr +++ b/agent/tool-scripts/tests/sar/gold/stderr @@ -1,14 +1,11 @@ sar: Error, one of the following options is required, --install|--start|--stop|--postprocess -The following options are available: + -h|--help display this help message and exit - --install verify this perf tool will work - --start|stop|postprocess start/stop/postprocess the data collection - -d str|--dir=str directory to store data collection (required) +Tool-specific options - these may be specified when you register a tool: + --interval=int number of seconds between each data collection (optional, default is 10 seconds) --options=str options passed directly to the tool (optional) - - -h|--help display this help message sar: WARNING - postprocess - tool output directory, '/var/tmp/pbench-test-tool-scripts/sar/tools-group/sar', missing sar: WARNING - stop - tool output directory, '/var/tmp/pbench-test-tool-scripts/sar/tools-group/sar', missing diff --git a/agent/tool-scripts/tests/strace/gold/stderr b/agent/tool-scripts/tests/strace/gold/stderr index 7524316a90..8225c09fec 100644 --- a/agent/tool-scripts/tests/strace/gold/stderr +++ b/agent/tool-scripts/tests/strace/gold/stderr @@ -1,14 +1,11 @@ strace: Error, one of the following options is required, --install|--start|--stop|--postprocess -The following options are available: + -h|--help display this help message and exit - --install verify this perf tool will work - --start|stop|postprocess start/stop/postprocess the data collection - -d str|--dir=str directory to store data collection (required) +Tool-specific options - these may be specified when you register a tool: + --pid=int a process ID to strace --pattern=str strace any PID which name matches this string (via pgrep) - - -h|--help display this help message strace: WARNING - postprocess - tool output directory, '/var/tmp/pbench-test-tool-scripts/strace/tools-group/strace', missing strace: WARNING - stop - tool output directory, '/var/tmp/pbench-test-tool-scripts/strace/tools-group/strace', missing diff --git a/agent/tool-scripts/tests/sysfs/gold/stderr b/agent/tool-scripts/tests/sysfs/gold/stderr index a5787cca83..9d7da150a9 100644 --- a/agent/tool-scripts/tests/sysfs/gold/stderr +++ b/agent/tool-scripts/tests/sysfs/gold/stderr @@ -1,16 +1,13 @@ sysfs: Error, one of the following options is required, --install|--start|--stop|--postprocess -The following options are available: + -h|--help display this help message and exit - --install verify this perf tool will work - --start|stop|postprocess start/stop/postprocess the data collection - -d str|--dir=str directory to store data collection (required) +Tool-specific options - these may be specified when you register a tool: + --interval=int number of seconds between each data collection (optional, default is 10 seconds) --path=str a path (beyond the /sysfs prefix) --pattern=str a pattern passed to -name option of find command to filter files --maxdepth=int a maxdepth passed to the find command to limit recursion depth - - -h|--help display this help message sysfs: WARNING - postprocess - tool output directory, '/var/tmp/pbench-test-tool-scripts/sysfs/tools-group/sysfs', missing sysfs: WARNING - stop - tool output directory, '/var/tmp/pbench-test-tool-scripts/sysfs/tools-group/sysfs', missing diff --git a/agent/tool-scripts/tests/systemtap/gold/stderr b/agent/tool-scripts/tests/systemtap/gold/stderr index cd56deadcb..b659aab47f 100644 --- a/agent/tool-scripts/tests/systemtap/gold/stderr +++ b/agent/tool-scripts/tests/systemtap/gold/stderr @@ -1,13 +1,10 @@ systemtap: Error, one of the following options is required, --install|--start|--stop|--postprocess -The following options are available: + -h|--help display this help message and exit - --install verify this perf tool will work - --start|stop|postprocess start/stop/postprocess the data collection - -d str|--dir=str directory to store data collection (required) - --script=str path to the systemtap script (required w/ --install) +Tool-specific options - these may be specified when you register a tool: - -h|--help display this help message + --script=str path to the systemtap script (required w/ --install) systemtap: WARNING - postprocess - tool output directory, '/var/tmp/pbench-test-tool-scripts/systemtap/tools-group/systemtap', missing systemtap: WARNING - stop - tool output directory, '/var/tmp/pbench-test-tool-scripts/systemtap/tools-group/systemtap', missing diff --git a/agent/tool-scripts/tests/tcpdump/gold/stderr b/agent/tool-scripts/tests/tcpdump/gold/stderr index 3a79525102..6416b04bf1 100644 --- a/agent/tool-scripts/tests/tcpdump/gold/stderr +++ b/agent/tool-scripts/tests/tcpdump/gold/stderr @@ -1,14 +1,11 @@ tcpdump: Error, one of the following options is required, --install|--start|--stop|--postprocess -The following options are available: + -h|--help display this help message and exit - --install verify this perf tool will work - --start|stop|postprocess start/stop/postprocess the data collection - -d str|--dir=str directory to store data collection (required) +Tool-specific options - these may be specified when you register a tool: + --interface=str the network interface to monitor --packets=int the number of packets to monitor before exiting - - -h|--help display this help message tcpdump: WARNING - postprocess - tool output directory, '/var/tmp/pbench-test-tool-scripts/tcpdump/tools-group/tcpdump', missing tcpdump: WARNING - stop - tool output directory, '/var/tmp/pbench-test-tool-scripts/tcpdump/tools-group/tcpdump', missing diff --git a/agent/tool-scripts/tests/turbostat/gold/stderr b/agent/tool-scripts/tests/turbostat/gold/stderr index 91ae1d3298..9097911937 100644 --- a/agent/tool-scripts/tests/turbostat/gold/stderr +++ b/agent/tool-scripts/tests/turbostat/gold/stderr @@ -1,13 +1,10 @@ turbostat: Error, one of the following options is required, --install|--start|--stop|--postprocess -The following options are available: + -h|--help display this help message and exit - --install verify this perf tool will work - --start|stop|postprocess start/stop/postprocess the data collection - -d str|--dir=str directory to store data collection (required) - --interval=int number of seconds between each data collection (optional, default is 10 seconds) +Tool-specific options - these may be specified when you register a tool: - -h|--help display this help message + --interval=int number of seconds between each data collection (optional, default is 10 seconds) turbostat: WARNING - postprocess - tool output directory, '/var/tmp/pbench-test-tool-scripts/turbostat/tools-group/turbostat', missing turbostat: WARNING - stop - tool output directory, '/var/tmp/pbench-test-tool-scripts/turbostat/tools-group/turbostat', missing diff --git a/agent/tool-scripts/tests/user-tool/gold/stderr b/agent/tool-scripts/tests/user-tool/gold/stderr index 77ef8171cd..c1166c4a9f 100644 --- a/agent/tool-scripts/tests/user-tool/gold/stderr +++ b/agent/tool-scripts/tests/user-tool/gold/stderr @@ -1,11 +1,10 @@ user-tool: Error, one of the following options is required, --install|--start|--stop|--postprocess -The following options are available: + -h|--help display this help message and exit - --install verify this perf tool will work - --start|stop|postprocess start/stop/postprocess the data collection - -d str|--dir=str directory to store data collection (required) +Tool-specific options - these may be specified when you register a tool: + --interval=int number of seconds between each data collection (optional, default is 10 seconds) --tool-name=str you must provide a unique name for this user tool --start-script=str run this user-provided script when starting this tool @@ -14,7 +13,5 @@ The following options are available: --file-to-capture=str capture the contents of this file at each interval you can use this option, or the start/stop/postprocess-script, but not both at the same time - - -h|--help display this help message user-tool: WARNING - postprocess - tool output directory, '/var/tmp/pbench-test-tool-scripts/user-tool/tools-group/user-tool-foo42', missing user-tool: WARNING - stop - tool output directory, '/var/tmp/pbench-test-tool-scripts/user-tool/tools-group/user-tool-foo42', missing diff --git a/agent/tool-scripts/tests/virsh-migrate/gold/stderr b/agent/tool-scripts/tests/virsh-migrate/gold/stderr index 61b7bc18be..3e8129a8de 100644 --- a/agent/tool-scripts/tests/virsh-migrate/gold/stderr +++ b/agent/tool-scripts/tests/virsh-migrate/gold/stderr @@ -1,14 +1,11 @@ virsh-migrate: Error, one of the following options is required, --install|--start|--stop|--postprocess -The following options are available: + -h|--help display this help message and exit - --install verify this perf tool will work - --start|stop|postprocess start/stop/postprocess the data collection - -d str|--dir=str directory to store data collection (required) +Tool-specific options - these may be specified when you register a tool: + --interval=int number of seconds between each data collection (optional, default is 10 seconds) --vm=str the name of the VM being migrated - - -h|--help display this help message virsh-migrate: WARNING - postprocess - tool output directory, '/var/tmp/pbench-test-tool-scripts/virsh-migrate/tools-group/virsh-migrate', missing virsh-migrate: WARNING - stop - tool output directory, '/var/tmp/pbench-test-tool-scripts/virsh-migrate/tools-group/virsh-migrate', missing diff --git a/agent/tool-scripts/tests/vmstat/gold/stderr b/agent/tool-scripts/tests/vmstat/gold/stderr index 3210955820..cd0f0c58fa 100644 --- a/agent/tool-scripts/tests/vmstat/gold/stderr +++ b/agent/tool-scripts/tests/vmstat/gold/stderr @@ -1,13 +1,10 @@ vmstat: Error, one of the following options is required, --install|--start|--stop|--postprocess -The following options are available: + -h|--help display this help message and exit - --install verify this perf tool will work - --start|stop|postprocess start/stop/postprocess the data collection - -d str|--dir=str directory to store data collection (required) - --interval=int number of seconds between each data collection (optional, default is 10 seconds) +Tool-specific options - these may be specified when you register a tool: - -h|--help display this help message + --interval=int number of seconds between each data collection (optional, default is 10 seconds) vmstat: WARNING - postprocess - tool output directory, '/var/tmp/pbench-test-tool-scripts/vmstat/tools-group/vmstat', missing vmstat: WARNING - stop - tool output directory, '/var/tmp/pbench-test-tool-scripts/vmstat/tools-group/vmstat', missing diff --git a/agent/util-scripts/gold/pbench-register-tool/test-44.txt b/agent/util-scripts/gold/pbench-register-tool/test-44.txt index 2f73f0defa..e545f5d7dd 100644 --- a/agent/util-scripts/gold/pbench-register-tool/test-44.txt +++ b/agent/util-scripts/gold/pbench-register-tool/test-44.txt @@ -65,6 +65,7 @@ Available tools: For a list of tool specific options, run: /var/tmp/pbench-test-utils/opt/pbench-agent/tool-scripts/ --help + --- Finished test-44 pbench-register-tool (status=1) +++ pbench tree state /var/tmp/pbench-test-utils/pbench diff --git a/agent/util-scripts/gold/pbench-register-tool/test-46.txt b/agent/util-scripts/gold/pbench-register-tool/test-46.txt index c6a547ee4e..4e920f539d 100644 --- a/agent/util-scripts/gold/pbench-register-tool/test-46.txt +++ b/agent/util-scripts/gold/pbench-register-tool/test-46.txt @@ -65,6 +65,7 @@ Available tools: For a list of tool specific options, run: /var/tmp/pbench-test-utils/opt/pbench-agent/tool-scripts/ --help + --- Finished test-46 pbench-register-tool (status=1) +++ pbench tree state /var/tmp/pbench-test-utils/pbench diff --git a/agent/util-scripts/gold/pbench-register-tool/test-47.txt b/agent/util-scripts/gold/pbench-register-tool/test-47.txt index 7b7350702f..ddbf5be19a 100644 --- a/agent/util-scripts/gold/pbench-register-tool/test-47.txt +++ b/agent/util-scripts/gold/pbench-register-tool/test-47.txt @@ -65,6 +65,7 @@ Available tools: For a list of tool specific options, run: /var/tmp/pbench-test-utils/opt/pbench-agent/tool-scripts/ --help + --- Finished test-47 pbench-register-tool (status=1) +++ pbench tree state /var/tmp/pbench-test-utils/pbench diff --git a/agent/util-scripts/pbench-register-tool b/agent/util-scripts/pbench-register-tool index 3bf1f56d3b..5e2dbb633c 100755 --- a/agent/util-scripts/pbench-register-tool +++ b/agent/util-scripts/pbench-register-tool @@ -132,7 +132,8 @@ function usage() { # 1 2 3 4 5 6 7 8 # (no tab) 12345678901234567890123456789012345678901234567890123456789012345678901234567890 printf -- "\nFor a list of tool specific options, run:\n" - printf -- "\t${pbench_bin}/tool-scripts/ --help\n" + printf -- "\t${pbench_bin}/tool-scripts/ --help\n\n" + } # Process options and arguments