Fix legacy unit tests

Author: ndokos

agent/tool-scripts/tests/blktrace/gold/stderr

@@ -2,11 +2,19 @@ blktrace: Error, one of the following options is required, --install|--start|--s
 
 The following options are available:
 
+Generic options - do *not* specify any of these when you register a tool:
+
 	--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 should be specified when you register a tool:
+
 	--devices=str,[str]       the list of block devices to trace (required w/ --start)
+Help option - do *not* specify this when you register a tool:
+
 
 	-h|--help                 display this help message
 blktrace: WARNING - postprocess - tool output directory, '/var/tmp/pbench-test-tool-scripts/blktrace/tools-group/blktrace', missing

agent/tool-scripts/tests/bpftrace/gold/stderr

@@ -2,11 +2,19 @@ bpftrace: Error, one of the following options is required, --install|--start|--s
 
 The following options are available:
 
+Generic options - do *not* specify any of these when you register a tool:
+
 	--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 should be specified when you register a tool:
+
 	--script=str              path to the bpftrace script (required w/ --start)
+Help option - do *not* specify this when you register a tool:
+
 
 	-h|--help                 display this help message
 bpftrace: WARNING - postprocess - tool output directory, '/var/tmp/pbench-test-tool-scripts/bpftrace/tools-group/bpftrace', missing

agent/tool-scripts/tests/cpuacct/gold/stderr

@@ -2,11 +2,19 @@ cpuacct: Error, one of the following options is required, --install|--start|--st
 
 The following options are available:
 
+Generic options - do *not* specify any of these when you register a tool:
+
 	--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 should be specified when you register a tool:
+
 	--interval=int            number of seconds between each data collection (optional, default is 10 seconds)
+Help option - do *not* specify this when you register a tool:
+
 
 	-h|--help                 display this help message
 cpuacct: WARNING - postprocess - tool output directory, '/var/tmp/pbench-test-tool-scripts/cpuacct/tools-group/cpuacct', missing

agent/tool-scripts/tests/disk/gold/stderr

@@ -2,11 +2,19 @@ disk: Error, one of the following options is required, --install|--start|--stop|
 
 The following options are available:
 
+Generic options - do *not* specify any of these when you register a tool:
+
 	--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 should be specified when you register a tool:
+
 	--interval=int            number of seconds between each data collection (optional, default is 10 seconds)
+Help option - do *not* specify this when you register a tool:
+
 
 	-h|--help                 display this help message
 disk: WARNING - postprocess - tool output directory, '/var/tmp/pbench-test-tool-scripts/disk/tools-group/disk', missing

agent/tool-scripts/tests/dm-cache/gold/stderr

@@ -2,11 +2,19 @@ dm-cache: Error, one of the following options is required, --install|--start|--s
 
 The following options are available:
 
+Generic options - do *not* specify any of these when you register a tool:
+
 	--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 should be specified when you register a tool:
+
 	--interval=int            number of seconds between each data collection (optional, default is 10 seconds)
+Help option - do *not* specify this when you register a tool:
+
 
 	-h|--help                 display this help message
 dm-cache: WARNING - postprocess - tool output directory, '/var/tmp/pbench-test-tool-scripts/dm-cache/tools-group/dm-cache', missing

agent/tool-scripts/tests/docker-info/gold/stderr

@@ -2,11 +2,19 @@ docker-info: Error, one of the following options is required, --install|--start|
 
 The following options are available:
 
+Generic options - do *not* specify any of these when you register a tool:
+
 	--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 should be specified when you register a tool:
+
 	--interval=int            number of seconds between each data collection (optional, default is 10 seconds)
+Help option - do *not* specify this when you register a tool:
+
 
 	-h|--help                 display this help message
 docker-info: WARNING - postprocess - tool output directory, '/var/tmp/pbench-test-tool-scripts/docker-info/tools-group/docker-info', missing

agent/tool-scripts/tests/docker/gold/stderr

@@ -2,11 +2,19 @@ docker: Error, one of the following options is required, --install|--start|--sto
 
 The following options are available:
 
+Generic options - do *not* specify any of these when you register a tool:
+
 	--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 should be specified when you register a tool:
+
 	--interval=int            number of seconds between each data collection (optional, default is 10 seconds)
+Help option - do *not* specify this when you register a tool:
+
 
 	-h|--help                 display this help message
 docker: WARNING - postprocess - tool output directory, '/var/tmp/pbench-test-tool-scripts/docker/tools-group/docker', missing

agent/tool-scripts/tests/haproxy-ocp/gold/stderr

@@ -2,12 +2,20 @@ haproxy-ocp: Error, one of the following options is required, --install|--start|
 
 The following options are available:
 
+Generic options - do *not* specify any of these when you register a tool:
+
 	--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 should 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')
+Help option - do *not* specify this when you register a tool:
+
 
 	-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

agent/tool-scripts/tests/iostat/gold/stderr

@@ -2,12 +2,20 @@ iostat: Error, one of the following options is required, --install|--start|--sto
 
 The following options are available:
 
+Generic options - do *not* specify any of these when you register a tool:
+
 	--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 should 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)
+Help option - do *not* specify this when you register a tool:
+
 
 	-h|--help                 display this help message
 iostat: WARNING - postprocess - tool output directory, '/var/tmp/pbench-test-tool-scripts/iostat/tools-group/iostat', missing

agent/tool-scripts/tests/jmap/gold/stderr

@@ -2,13 +2,21 @@ jmap: Error, one of the following options is required, --install|--start|--stop|
 
 The following options are available:
 
+Generic options - do *not* specify any of these when you register a tool:
+
 	--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 should 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)
+Help option - do *not* specify this when you register a tool:
+
 
 	-h|--help                 display this help message
 jmap: WARNING - postprocess - tool output directory, '/var/tmp/pbench-test-tool-scripts/jmap/tools-group/jmap', missing