mirror/masonr-yet-another-bench-script
1
0
Fork 0
mirror of https://github.com/masonr/yet-another-bench-script.git synced 2024-05-11 16:54:51 +00:00
Code Issues Releases Activity

modified json output to file flag

Browse Source
This commit is contained in:
Mason Rowe
2022-08-19 19:27:32 -04:00
parent 506cdc4991
commit 6af3d0210c
2 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
README.md
View File

@ -42,7 +42,7 @@ curl -sL yabs.sh | bash -s -- -flags
* `-4` this option overrides the Geekbench 5 performance test and runs a Geekbench 4 test instead * `-4` this option overrides the Geekbench 5 performance test and runs a Geekbench 4 test instead
* `-9` this option runs the Geekbench 4 test in addition to the Geekbench 5 test * `-9` this option runs the Geekbench 4 test in addition to the Geekbench 5 test
* `-j` this option prints a JSON representation of the results to the screen * `-j` this option prints a JSON representation of the results to the screen
* `-w` this option writes the JSON results to a file * `-w <filename>` this option writes the JSON results to a file using the file name provided
* `-s <url>` this option sends a JSON representation of the results to the designated URL(s) (see section below) * `-s <url>` this option sends a JSON representation of the results to the designated URL(s) (see section below)
Options can be grouped together to skip multiple tests, i.e. `-fg` to skip the disk and system performance tests (effectively only testing network performance). Options can be grouped together to skip multiple tests, i.e. `-fg` to skip the disk and system performance tests (effectively only testing network performance).

14
yabs.sh
View File

@ -12,7 +12,7 @@
# performance via fio. The script is designed to not require any dependencies # performance via fio. The script is designed to not require any dependencies
# - either compiled or installed - nor admin privileges to run. # - either compiled or installed - nor admin privileges to run.
# #
YABS_VERSION="v2022-08-17" YABS_VERSION="v2022-08-19"
echo -e '# ## ## ## ## ## ## ## ## ## ## ## ## ## ## ## ## ## #' echo -e '# ## ## ## ## ## ## ## ## ## ## ## ## ## ## ## ## ## #'
echo -e '# Yet-Another-Bench-Script #' echo -e '# Yet-Another-Bench-Script #'
@ -58,11 +58,11 @@ else
fi fi
# flags to skip certain performance tests # flags to skip certain performance tests
unset PREFER_BIN SKIP_FIO SKIP_IPERF SKIP_GEEKBENCH PRINT_HELP REDUCE_NET GEEKBENCH_4 GEEKBENCH_5 DD_FALLBACK IPERF_DL_FAIL JSON JSON_SEND JSON_RESULT unset PREFER_BIN SKIP_FIO SKIP_IPERF SKIP_GEEKBENCH PRINT_HELP REDUCE_NET GEEKBENCH_4 GEEKBENCH_5 DD_FALLBACK IPERF_DL_FAIL JSON JSON_SEND JSON_RESULT JSON_FILE
GEEKBENCH_5="True" # gb5 test enabled by default GEEKBENCH_5="True" # gb5 test enabled by default
# get any arguments that were passed to the script and set the associated skip flags (if applicable) # get any arguments that were passed to the script and set the associated skip flags (if applicable)
while getopts 'bfdighr49jws:' flag; do while getopts 'bfdighr49jw:s:' flag; do
case "${flag}" in case "${flag}" in
b) PREFER_BIN="True" ;; b) PREFER_BIN="True" ;;
f) SKIP_FIO="True" ;; f) SKIP_FIO="True" ;;
@ -74,7 +74,7 @@ while getopts 'bfdighr49jws:' flag; do
4) GEEKBENCH_4="True" && unset GEEKBENCH_5 ;; 4) GEEKBENCH_4="True" && unset GEEKBENCH_5 ;;
9) GEEKBENCH_4="True" && GEEKBENCH_5="True" ;; 9) GEEKBENCH_4="True" && GEEKBENCH_5="True" ;;
j) JSON+="j" ;; j) JSON+="j" ;;
w) JSON+="w" ;; w) JSON+="w" && JSON_FILE=${OPTARG} ;;
s) JSON+="s" && JSON_SEND=${OPTARG} ;; s) JSON+="s" && JSON_SEND=${OPTARG} ;;
*) exit 1 ;; *) exit 1 ;;
esac esac
@ -118,7 +118,7 @@ if [ ! -z "$PRINT_HELP" ]; then
echo -e " -4 : use geekbench 4 instead of geekbench 5" echo -e " -4 : use geekbench 4 instead of geekbench 5"
echo -e " -9 : use both geekbench 4 AND geekbench 5" echo -e " -9 : use both geekbench 4 AND geekbench 5"
echo -e " -j : print jsonified YABS results at conclusion of test" echo -e " -j : print jsonified YABS results at conclusion of test"
echo -e " -w : write jsonified YABS results to disk" echo -e " -w <filename> : write jsonified YABS results to disk using file name provided"
echo -e " -s <url> : send jsonified YABS results to URL" echo -e " -s <url> : send jsonified YABS results to URL"
echo -e echo -e
echo -e "Detected Arch: $ARCH" echo -e "Detected Arch: $ARCH"
@ -149,7 +149,7 @@ if [ ! -z "$PRINT_HELP" ]; then
echo -e "JSON Options:" echo -e "JSON Options:"
[[ -z $JSON ]] && echo -e " none" [[ -z $JSON ]] && echo -e " none"
[[ $JSON = *j* ]] && echo -e " printing json to screen after test" [[ $JSON = *j* ]] && echo -e " printing json to screen after test"
[[ $JSON = *w* ]] && echo -e " writing json to file after test" [[ $JSON = *w* ]] && echo -e " writing json to file ($JSON_FILE) after test"
[[ $JSON = *s* ]] && echo -e " sharing json YABS results to $JSON_SEND" [[ $JSON = *s* ]] && echo -e " sharing json YABS results to $JSON_SEND"
echo -e echo -e
echo -e "Exiting..." echo -e "Exiting..."
@ -889,7 +889,7 @@ if [[ ! -z $JSON ]]; then
# write json results to file # write json results to file
if [[ $JSON = *w* ]]; then if [[ $JSON = *w* ]]; then
echo $JSON_RESULT > yabs_$TIME_START.json echo $JSON_RESULT > $JSON_FILE
fi fi
# send json results # send json results