mirror of
https://github.com/AuxXxilium/yet-another-bench-script.git
synced 2024-11-23 23:01:02 +07:00
Fix formatting; Fix bug in GeekBench failure detection
This commit is contained in:
parent
bf01122bde
commit
7978df4c3d
7
yabs.sh
7
yabs.sh
@ -15,7 +15,7 @@
|
||||
|
||||
echo -e '# ## ## ## ## ## ## ## ## ## ## ## ## ## ## ## ## ## #'
|
||||
echo -e '# Yet-Another-Bench-Script #'
|
||||
echo -e '# v2020-12-27 #'
|
||||
echo -e '# v2020-12-29 #'
|
||||
echo -e '# https://github.com/masonr/yet-another-bench-script #'
|
||||
echo -e '# ## ## ## ## ## ## ## ## ## ## ## ## ## ## ## ## ## #'
|
||||
|
||||
@ -344,8 +344,6 @@ if [[ -z "$SKIP_FIO" && "$AVAIL_SPACE" -lt 2097152 ]]; then # 2GB = 2097152KB
|
||||
echo -e "\nLess than 2GB of space available. Skipping disk test..."
|
||||
# if the skip disk flag was set, skip the disk performance test, otherwise test disk performance
|
||||
elif [ -z "$SKIP_FIO" ]; then
|
||||
echo -en "\nPreparing system for disk tests..."
|
||||
|
||||
# Perform ZFS filesystem detection and determine if we have enough free space according to spa_asize_inflation
|
||||
ZFSCHECK="/sys/module/zfs/parameters/spa_asize_inflation"
|
||||
if [[ -f "$ZFSCHECK" ]];then
|
||||
@ -395,6 +393,7 @@ if [[ -f "$ZFSCHECK" ]];then
|
||||
fi
|
||||
fi
|
||||
|
||||
echo -en "\nPreparing system for disk tests..."
|
||||
|
||||
# create temp directory to store disk write/read test files
|
||||
DISK_PATH=$YABS_PATH/disk
|
||||
@ -716,7 +715,7 @@ function launch_geekbench {
|
||||
|
||||
# ensure the test ran successfully
|
||||
if [ -z "$GEEKBENCH_TEST" ]; then
|
||||
if [[ ! -z "$IPV4_CHECK" ]]; then
|
||||
if [[ -z "$IPV4_CHECK" ]]; then
|
||||
# Geekbench test failed to download because host lacks IPv4 (cdn.geekbench.com = IPv4 only)
|
||||
echo -e "\r\033[0KGeekbench releases can only be downloaded over IPv4. FTP the Geekbench files and run manually."
|
||||
elif [[ $ARCH != *x86* ]]; then
|
||||
|
Loading…
Reference in New Issue
Block a user