Mirrors/yet-another-bench-script
1
0
Fork 0
mirror of https://github.com/masonr/yet-another-bench-script.git synced 2025-10-30 21:36:17 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Fix formatting; Fix bug in GeekBench failure detection

Browse Source
This commit is contained in:
Mason Rowe
2020-12-29 08:39:49 -05:00
committed by GitHub
parent bf01122bde
commit 7978df4c3d
1 changed files with 45 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
yabs.sh
View File

@@ -15,7 +15,7 @@
echo -e '# ## ## ## ## ## ## ## ## ## ## ## ## ## ## ## ## ## #' echo -e '# ## ## ## ## ## ## ## ## ## ## ## ## ## ## ## ## ## #'
echo -e '# Yet-Another-Bench-Script #' 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 '# https://github.com/masonr/yet-another-bench-script #'
echo -e '# ## ## ## ## ## ## ## ## ## ## ## ## ## ## ## ## ## #' echo -e '# ## ## ## ## ## ## ## ## ## ## ## ## ## ## ## ## ## #'
@@ -344,11 +344,9 @@ if [[ -z "$SKIP_FIO" && "$AVAIL_SPACE" -lt 2097152 ]]; then # 2GB = 2097152KB
echo -e "\nLess than 2GB of space available. Skipping disk test..." 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 # if the skip disk flag was set, skip the disk performance test, otherwise test disk performance
elif [ -z "$SKIP_FIO" ]; then 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"
# Perform ZFS filesystem detection and determine if we have enough free space according to spa_asize_inflation if [[ -f "$ZFSCHECK" ]];then
ZFSCHECK="/sys/module/zfs/parameters/spa_asize_inflation"
if [[ -f "$ZFSCHECK" ]];then
mul_spa=$((($(cat /sys/module/zfs/parameters/spa_asize_inflation)*2))) mul_spa=$((($(cat /sys/module/zfs/parameters/spa_asize_inflation)*2)))
warning=0 warning=0
poss=() poss=()
@@ -393,8 +391,9 @@ if [[ -f "$ZFSCHECK" ]];then
if [[ $warning -eq 1 ]];then if [[ $warning -eq 1 ]];then
echo -en "\nWarning! You are running YABS on a ZFS Filesystem and your disk space is too low for the fio test. Your test results will be inaccurate. You need at least $mul_spa GB free in order to complete this test accurately. For more information, please see https://github.com/masonr/yet-another-bench-script/issues/13\n" echo -en "\nWarning! You are running YABS on a ZFS Filesystem and your disk space is too low for the fio test. Your test results will be inaccurate. You need at least $mul_spa GB free in order to complete this test accurately. For more information, please see https://github.com/masonr/yet-another-bench-script/issues/13\n"
fi fi
fi fi
echo -en "\nPreparing system for disk tests..."
# create temp directory to store disk write/read test files # create temp directory to store disk write/read test files
DISK_PATH=$YABS_PATH/disk DISK_PATH=$YABS_PATH/disk
@@ -716,7 +715,7 @@ function launch_geekbench {
# ensure the test ran successfully # ensure the test ran successfully
if [ -z "$GEEKBENCH_TEST" ]; then 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) # 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." echo -e "\r\033[0KGeekbench releases can only be downloaded over IPv4. FTP the Geekbench files and run manually."
elif [[ $ARCH != *x86* ]]; then elif [[ $ARCH != *x86* ]]; then