Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions agent/bench-scripts/pbench-run-benchmark
Original file line number Diff line number Diff line change
Expand Up @@ -298,6 +298,10 @@ while (scalar @param_sets > 0) {
push(@iterations_labels, $iteration_label);
}

if (! $pp_only) {
system("pbench-init-tools --group=" . $tool_group . " --dir=" . $base_bench_dir);
}

for (my $index=0; $index<@iterations; $index++) {
my $iteration_params = $iterations[$index];
my $iteration_label = $iterations_labels[$index];
Expand Down Expand Up @@ -389,6 +393,8 @@ while (scalar @param_sets > 0) {
print BULK_FH "echo Sample processing complete!\n";
close(BULK_FH);
system(". ./bulk-sample.sh");
} else {
system("pbench-end-tools --group=" . $tool_group . " --dir=" . $base_bench_dir);
}
$run_doc{'run'}{'end'} = int time * 1000; # time in milliseconds
put_json_file(\%run_doc, $es_dir . "/run/run" . $run_part . "-" . $run_doc{'run'}{'id'} . ".json");
Expand Down
5 changes: 5 additions & 0 deletions agent/bench-scripts/pbench-user-benchmark
Original file line number Diff line number Diff line change
Expand Up @@ -300,6 +300,9 @@ declare -a parts
# the while loop sub-shell does not share FD 0 (stdin) with the executed
# benchmark script. Otherwise, benchmarks messing around with FD 0 can lead to
# problems.

pbench-init-tools --group=${tool_group} --dir=${benchmark_run_dir}

while read -u 3 line; do
# Current line number, starting from 1 (not zero)
(( lineno++ ))
Expand Down Expand Up @@ -334,6 +337,8 @@ if [[ ${iter_num} -eq 1 ]]; then
warn_log "[${script_name}]: iteration file did not contain any iterations!"
fi

pbench-end-tools --group=${tool_group} --dir=${benchmark_run_dir}

# Now that we have finished running all the iterations, create the
# reference-result symlinks.
result_dirs="$(ls -1d ${benchmark_run_dir}/*/${sample_name} 2> /dev/null)"
Expand Down
1 change: 1 addition & 0 deletions agent/bench-scripts/test-bin/pbench-end-tools
1 change: 1 addition & 0 deletions agent/bench-scripts/test-bin/pbench-init-tools
2 changes: 2 additions & 0 deletions agent/bench-scripts/tests/pbench-user-benchmark/test-09.txt
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,8 @@ Running user-benchmark-script no-file for iteration 1-default
+++ test-execution.log file contents
/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/pbench-collect-sysinfo --group=default --dir=/var/tmp/pbench-test-bench/pbench-agent/pbench-user-benchmark_test-09_1900.01.01T00.00.00 --sysinfo=default end
/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/pbench-collect-sysinfo --sysinfo=default --check
/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/pbench-end-tools --group=default --dir=/var/tmp/pbench-test-bench/pbench-agent/pbench-user-benchmark_test-09_1900.01.01T00.00.00
/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/pbench-init-tools --group=default --dir=/var/tmp/pbench-test-bench/pbench-agent/pbench-user-benchmark_test-09_1900.01.01T00.00.00
/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/pbench-metadata-log --group=default --dir=/var/tmp/pbench-test-bench/pbench-agent/pbench-user-benchmark_test-09_1900.01.01T00.00.00 beg
/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/pbench-metadata-log --group=default --dir=/var/tmp/pbench-test-bench/pbench-agent/pbench-user-benchmark_test-09_1900.01.01T00.00.00 end
/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/pbench-postprocess-tools --group=default --dir=/var/tmp/pbench-test-bench/pbench-agent/pbench-user-benchmark_test-09_1900.01.01T00.00.00/1-default/sample1
Expand Down
2 changes: 2 additions & 0 deletions agent/bench-scripts/tests/pbench-user-benchmark/test-10.txt
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,8 @@ Running user-benchmark-script no-duration for iteration 1-default
+++ test-execution.log file contents
/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/pbench-collect-sysinfo --group=default --dir=/var/tmp/pbench-test-bench/pbench-agent/pbench-user-benchmark_test-10_1900.01.01T00.00.00 --sysinfo=default end
/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/pbench-collect-sysinfo --sysinfo=default --check
/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/pbench-end-tools --group=default --dir=/var/tmp/pbench-test-bench/pbench-agent/pbench-user-benchmark_test-10_1900.01.01T00.00.00
/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/pbench-init-tools --group=default --dir=/var/tmp/pbench-test-bench/pbench-agent/pbench-user-benchmark_test-10_1900.01.01T00.00.00
/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/pbench-metadata-log --group=default --dir=/var/tmp/pbench-test-bench/pbench-agent/pbench-user-benchmark_test-10_1900.01.01T00.00.00 beg
/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/pbench-metadata-log --group=default --dir=/var/tmp/pbench-test-bench/pbench-agent/pbench-user-benchmark_test-10_1900.01.01T00.00.00 end
/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/pbench-postprocess-tools --group=default --dir=/var/tmp/pbench-test-bench/pbench-agent/pbench-user-benchmark_test-10_1900.01.01T00.00.00/1-default/sample1
Expand Down
2 changes: 2 additions & 0 deletions agent/bench-scripts/tests/pbench-user-benchmark/test-11.txt
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,8 @@ Running user-benchmark-script with-duration for iteration 1-default
+++ test-execution.log file contents
/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/pbench-collect-sysinfo --group=default --dir=/var/tmp/pbench-test-bench/pbench-agent/pbench-user-benchmark_test-11_1900.01.01T00.00.00 --sysinfo=default end
/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/pbench-collect-sysinfo --sysinfo=default --check
/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/pbench-end-tools --group=default --dir=/var/tmp/pbench-test-bench/pbench-agent/pbench-user-benchmark_test-11_1900.01.01T00.00.00
/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/pbench-init-tools --group=default --dir=/var/tmp/pbench-test-bench/pbench-agent/pbench-user-benchmark_test-11_1900.01.01T00.00.00
/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/pbench-metadata-log --group=default --dir=/var/tmp/pbench-test-bench/pbench-agent/pbench-user-benchmark_test-11_1900.01.01T00.00.00 beg
/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/pbench-metadata-log --group=default --dir=/var/tmp/pbench-test-bench/pbench-agent/pbench-user-benchmark_test-11_1900.01.01T00.00.00 end
/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/pbench-postprocess-tools --group=default --dir=/var/tmp/pbench-test-bench/pbench-agent/pbench-user-benchmark_test-11_1900.01.01T00.00.00/1-default/sample1
Expand Down
2 changes: 2 additions & 0 deletions agent/bench-scripts/tests/pbench-user-benchmark/test-12.txt
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,8 @@ WARNING:root:Unable to load JSON data from /var/tmp/pbench-test-bench/pbench-age
+++ test-execution.log file contents
/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/pbench-collect-sysinfo --group=default --dir=/var/tmp/pbench-test-bench/pbench-agent/pbench-user-benchmark_test-12_1900.01.01T00.00.00 --sysinfo=default end
/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/pbench-collect-sysinfo --sysinfo=default --check
/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/pbench-end-tools --group=default --dir=/var/tmp/pbench-test-bench/pbench-agent/pbench-user-benchmark_test-12_1900.01.01T00.00.00
/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/pbench-init-tools --group=default --dir=/var/tmp/pbench-test-bench/pbench-agent/pbench-user-benchmark_test-12_1900.01.01T00.00.00
/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/pbench-metadata-log --group=default --dir=/var/tmp/pbench-test-bench/pbench-agent/pbench-user-benchmark_test-12_1900.01.01T00.00.00 beg
/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/pbench-metadata-log --group=default --dir=/var/tmp/pbench-test-bench/pbench-agent/pbench-user-benchmark_test-12_1900.01.01T00.00.00 end
/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/pbench-postprocess-tools --group=default --dir=/var/tmp/pbench-test-bench/pbench-agent/pbench-user-benchmark_test-12_1900.01.01T00.00.00/1-default/sample1
Expand Down
2 changes: 2 additions & 0 deletions agent/bench-scripts/tests/pbench-user-benchmark/test-23.txt
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,8 @@ sud
+++ test-execution.log file contents
/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/pbench-collect-sysinfo --group=default --dir=/var/tmp/pbench-test-bench/pbench-agent/pbench-user-benchmark_test-23_1900.01.01T00.00.00 --sysinfo=default end
/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/pbench-collect-sysinfo --sysinfo=default --check
/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/pbench-end-tools --group=default --dir=/var/tmp/pbench-test-bench/pbench-agent/pbench-user-benchmark_test-23_1900.01.01T00.00.00
/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/pbench-init-tools --group=default --dir=/var/tmp/pbench-test-bench/pbench-agent/pbench-user-benchmark_test-23_1900.01.01T00.00.00
/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/pbench-metadata-log --group=default --dir=/var/tmp/pbench-test-bench/pbench-agent/pbench-user-benchmark_test-23_1900.01.01T00.00.00 beg
/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/pbench-metadata-log --group=default --dir=/var/tmp/pbench-test-bench/pbench-agent/pbench-user-benchmark_test-23_1900.01.01T00.00.00 end
/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/pbench-postprocess-tools --group=default --dir=/var/tmp/pbench-test-bench/pbench-agent/pbench-user-benchmark_test-23_1900.01.01T00.00.00/1-default/sample1
Expand Down
2 changes: 2 additions & 0 deletions agent/bench-scripts/tests/pbench-user-benchmark/test-24.txt
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,8 @@ Running user-benchmark-script no-file for iteration 1-default
+++ test-execution.log file contents
/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/pbench-collect-sysinfo --group=default --dir=/var/tmp/pbench-test-bench/pbench-agent/pbench-user-benchmark_test-24_1900.01.01T00.00.00 --sysinfo=default end
/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/pbench-collect-sysinfo --sysinfo=default --check
/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/pbench-end-tools --group=default --dir=/var/tmp/pbench-test-bench/pbench-agent/pbench-user-benchmark_test-24_1900.01.01T00.00.00
/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/pbench-init-tools --group=default --dir=/var/tmp/pbench-test-bench/pbench-agent/pbench-user-benchmark_test-24_1900.01.01T00.00.00
/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/pbench-metadata-log --group=default --dir=/var/tmp/pbench-test-bench/pbench-agent/pbench-user-benchmark_test-24_1900.01.01T00.00.00 beg
/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/pbench-metadata-log --group=default --dir=/var/tmp/pbench-test-bench/pbench-agent/pbench-user-benchmark_test-24_1900.01.01T00.00.00 end
/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/pbench-postprocess-tools --group=default --dir=/var/tmp/pbench-test-bench/pbench-agent/pbench-user-benchmark_test-24_1900.01.01T00.00.00/1-default/sample1
Expand Down
2 changes: 2 additions & 0 deletions agent/bench-scripts/tests/pbench-user-benchmark/test-25.txt
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,8 @@ Running user-benchmark-script no-file for iteration 1-default
+++ test-execution.log file contents
/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/pbench-collect-sysinfo --group=default --dir=/var/tmp/pbench-test-bench/pbench-agent/pbench-user-benchmark_test-25_1900.01.01T00.00.00 --sysinfo=default end
/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/pbench-collect-sysinfo --sysinfo=default --check
/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/pbench-end-tools --group=default --dir=/var/tmp/pbench-test-bench/pbench-agent/pbench-user-benchmark_test-25_1900.01.01T00.00.00
/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/pbench-init-tools --group=default --dir=/var/tmp/pbench-test-bench/pbench-agent/pbench-user-benchmark_test-25_1900.01.01T00.00.00
/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/pbench-metadata-log --group=default --dir=/var/tmp/pbench-test-bench/pbench-agent/pbench-user-benchmark_test-25_1900.01.01T00.00.00 beg
/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/pbench-metadata-log --group=default --dir=/var/tmp/pbench-test-bench/pbench-agent/pbench-user-benchmark_test-25_1900.01.01T00.00.00 end
/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/pbench-postprocess-tools --group=default --dir=/var/tmp/pbench-test-bench/pbench-agent/pbench-user-benchmark_test-25_1900.01.01T00.00.00/1-default/sample1
Expand Down
2 changes: 2 additions & 0 deletions agent/bench-scripts/tests/pbench-user-benchmark/test-37.txt
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,8 @@
+++ test-execution.log file contents
/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/pbench-collect-sysinfo --group=default --dir=/var/tmp/pbench-test-bench/pbench-agent/pbench-user-benchmark_test-37_1900.01.01T00.00.00 --sysinfo=default end
/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/pbench-collect-sysinfo --sysinfo=default --check
/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/pbench-end-tools --group=default --dir=/var/tmp/pbench-test-bench/pbench-agent/pbench-user-benchmark_test-37_1900.01.01T00.00.00
/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/pbench-init-tools --group=default --dir=/var/tmp/pbench-test-bench/pbench-agent/pbench-user-benchmark_test-37_1900.01.01T00.00.00
/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/pbench-metadata-log --group=default --dir=/var/tmp/pbench-test-bench/pbench-agent/pbench-user-benchmark_test-37_1900.01.01T00.00.00 beg
/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/pbench-metadata-log --group=default --dir=/var/tmp/pbench-test-bench/pbench-agent/pbench-user-benchmark_test-37_1900.01.01T00.00.00 end
/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/pbench-tool-meister-start default
Expand Down
2 changes: 2 additions & 0 deletions agent/bench-scripts/tests/pbench-user-benchmark/test-38.txt
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,8 @@ Running bm arg1 arg2 for iteration 3-iter-three
/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/bm arg1 arg2 arg3
/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/pbench-collect-sysinfo --group=default --dir=/var/tmp/pbench-test-bench/pbench-agent/pbench-user-benchmark_test-38_1900.01.01T00.00.00 --sysinfo=default end
/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/pbench-collect-sysinfo --sysinfo=default --check
/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/pbench-end-tools --group=default --dir=/var/tmp/pbench-test-bench/pbench-agent/pbench-user-benchmark_test-38_1900.01.01T00.00.00
/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/pbench-init-tools --group=default --dir=/var/tmp/pbench-test-bench/pbench-agent/pbench-user-benchmark_test-38_1900.01.01T00.00.00
/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/pbench-metadata-log --group=default --dir=/var/tmp/pbench-test-bench/pbench-agent/pbench-user-benchmark_test-38_1900.01.01T00.00.00 beg
/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/pbench-metadata-log --group=default --dir=/var/tmp/pbench-test-bench/pbench-agent/pbench-user-benchmark_test-38_1900.01.01T00.00.00 end
/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/pbench-postprocess-tools --group=default --dir=/var/tmp/pbench-test-bench/pbench-agent/pbench-user-benchmark_test-38_1900.01.01T00.00.00/1-iter-one/sample1
Expand Down
24 changes: 24 additions & 0 deletions agent/tool-scripts/dcgm
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
#!/usr/bin/python3
# -*- mode: python -*-

import sys
import os
import logging

PROG = os.path.basename(sys.argv[0])
logger = logging.getLogger(PROG)
logger.setLevel(logging.DEBUG)
sh = logging.StreamHandler()
sh.setLevel(logging.DEBUG)
shf = logging.Formatter("%(message)s")
sh.setFormatter(shf)
logger.addHandler(sh)

if len(sys.argv) != 2 or sys.argv[1] != "--help":
logger.info("This script is deprecated, please run it with --help for info on registering the tool.")
logger.info("Run /opt/pbench-agent/tool-scripts/dcgm --help for more info.")
exit(0)

if sys.argv[1] == "--help":
logger.info("Options:")
logger.info("--inst=<LOCATION OF dcgm INSTALL> (required)")
48 changes: 48 additions & 0 deletions agent/tool-scripts/meta.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,48 @@
{
"transient":{
"blktrace": null,
"bpftrace": null,
"cpuacct": null,
"disk": null,
"dm-cache": null,
"docker": null,
"docker-info": null,
"external-data-source": null,
"haproxy-ocp": null,
"iostat": null,
"jmap": null,
"jstack": null,
"kvm-spinlock": null,
"kvmstat": null,
"kvmtrace": null,
"lockstat": null,
"mpstat": null,
"numastat": null,
"oc": null,
"openvswitch": null,
"pcp": null,
"perf": null,
"pidstat": null,
"pprof": null,
"proc-interrupts": null,
"proc-sched_debug": null,
"proc-vmstat": null,
"prometheus-metrics": null,
"qemu-migrate": null,
"rabbit": null,
"sar": null,
"strace": null,
"sysfs": null,
"systemtap": null,
"tcpdump": null,
"turbostat": null,
"user-tool": null,
"virsh-migrate": null,
"vmstat": null
},

"persistent":{
"node-exporter": {"collector": "prometheus", "port": "9100"},
"dcgm": {"collector": "prometheus", "port": "8000"}
}
}
32 changes: 32 additions & 0 deletions agent/tool-scripts/node-exporter
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
#!/usr/bin/python3
# -*- mode: python -*-

import os
import sys
import logging

PROG = os.path.basename(sys.argv[0])
logger = logging.getLogger(PROG)
logger.setLevel(logging.DEBUG)
sh = logging.StreamHandler()
sh.setLevel(logging.DEBUG)
shf = logging.Formatter("%(message)s")
sh.setFormatter(shf)
logger.addHandler(sh)

if len(sys.argv) != 2 or sys.argv[1] != "--help":
logger.info(
"This script is deprecated, please run it with --help for info on registering the tool."
)
logger.info(
"Run /opt/pbench-agent/tool-scripts/node-exporter --help for more info."
)
exit(0)

if sys.argv[1] == "--help":
logger.info("Options:")
logger.info(
"--inst=</path/to/node_exporter/dir> (required; to create the path of the executable, '/node-exporter' will be appended)"
)
logger.info("Installation Guide: github.com/prometheus/node_exporter")
logger.info("Soon to come: metric enabling/disabling")
16 changes: 16 additions & 0 deletions agent/util-scripts/gold/pbench-end-tools/test-62.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
+++ Running test-62 pbench-end-tools --group=default --dir=/var/tmp/pbench-test-utils/pbench/mock-run
--- Finished test-62 pbench-end-tools (status=0)
+++ pbench tree state
/var/tmp/pbench-test-utils/pbench
/var/tmp/pbench-test-utils/pbench/mock-run
/var/tmp/pbench-test-utils/pbench/mock-run/tools-default
/var/tmp/pbench-test-utils/pbench/tmp
/var/tmp/pbench-test-utils/pbench/tools-v1-default
/var/tmp/pbench-test-utils/pbench/tools-v1-default/testhost.example.com
/var/tmp/pbench-test-utils/pbench/tools-v1-default/testhost.example.com/mpstat
=== /var/tmp/pbench-test-utils/pbench/tools-v1-default/testhost.example.com/mpstat:
--interval=3
--- pbench tree state
+++ test-execution.log file contents
/var/tmp/pbench-test-utils/opt/pbench-agent/unittest-scripts/pbench-tool-meister-client default /var/tmp/pbench-test-utils/pbench/mock-run/tools-default end
--- test-execution.log file contents
16 changes: 16 additions & 0 deletions agent/util-scripts/gold/pbench-init-tools/test-61.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
+++ Running test-61 pbench-init-tools --group=default --dir=/var/tmp/pbench-test-utils/pbench/mock-run
--- Finished test-61 pbench-init-tools (status=0)
+++ pbench tree state
/var/tmp/pbench-test-utils/pbench
/var/tmp/pbench-test-utils/pbench/mock-run
/var/tmp/pbench-test-utils/pbench/mock-run/tools-default
/var/tmp/pbench-test-utils/pbench/tmp
/var/tmp/pbench-test-utils/pbench/tools-v1-default
/var/tmp/pbench-test-utils/pbench/tools-v1-default/testhost.example.com
/var/tmp/pbench-test-utils/pbench/tools-v1-default/testhost.example.com/mpstat
=== /var/tmp/pbench-test-utils/pbench/tools-v1-default/testhost.example.com/mpstat:
--interval=3
--- pbench tree state
+++ test-execution.log file contents
/var/tmp/pbench-test-utils/opt/pbench-agent/unittest-scripts/pbench-tool-meister-client default /var/tmp/pbench-test-utils/pbench/mock-run/tools-default init
--- test-execution.log file contents
7 changes: 7 additions & 0 deletions agent/util-scripts/gold/pbench-kill-tools/test-09.txt
Original file line number Diff line number Diff line change
@@ -1,5 +1,12 @@
+++ Running test-09 pbench-kill-tools --group=barfoo
ERROR: required directory argument missing.
The following are required:

-g str --group=str, str = a tool group used in a benchmark
(the default group is 'default')

-d str --dir=str, str = a directory where pbench-kill-tools
will store and process data
--- Finished test-09 pbench-kill-tools (status=1)
+++ pbench tree state
/var/tmp/pbench-test-utils/pbench
Expand Down
2 changes: 2 additions & 0 deletions agent/util-scripts/gold/pbench-register-tool/test-44.txt
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,8 @@ Available tools:
user-tool
virsh-migrate
vmstat
node-exporter
dcgm

For a list of tool specific options, run:
/var/tmp/pbench-test-utils/opt/pbench-agent/tool-scripts/<tool-name> --help
Expand Down
2 changes: 2 additions & 0 deletions agent/util-scripts/gold/pbench-register-tool/test-46.txt
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,8 @@ Available tools:
user-tool
virsh-migrate
vmstat
node-exporter
dcgm

For a list of tool specific options, run:
/var/tmp/pbench-test-utils/opt/pbench-agent/tool-scripts/<tool-name> --help
Expand Down
2 changes: 2 additions & 0 deletions agent/util-scripts/gold/pbench-register-tool/test-47.txt
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,8 @@ Available tools:
user-tool
virsh-migrate
vmstat
node-exporter
dcgm

For a list of tool specific options, run:
/var/tmp/pbench-test-utils/opt/pbench-agent/tool-scripts/<tool-name> --help
Expand Down
Loading