DevOps/SSH-Benchmark
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

update

Browse Source
This commit is contained in:
zun.yang
2023-07-27 23:12:35 +08:00
parent 1fb0e79ea7
commit 197ccf5e7d
6 changed files with 96 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
benchmark/geekbench.license
View File

@ -1 +0,0 @@
1934531619@qq.com JDN2X-DHS55-OAYJX-JNR32-BFQXZ-ASDRJ-QYANY-CC7NX-JV3QW

32
benchmark/run.sh
View File

@ -1,13 +1,14 @@
#!/bin/bash
export PATH=$PATH:$(pwd)/tools
YYDS_VERSION="v2022-11-24"
MAIN_VERSION="V2022-11-24"
BENCHMARK_HOST="${1}"
GEEKBENCH_LICENSE="${2}"
echo -e '# ## ## ## ## ## ## ## ## ## ## ## ## ## ## ## ## ## #'
echo -e '# RUN-Bench-Script #'
echo -e '# '$YYDS_VERSION' #'
echo -e '# https://gitlab-ee.treesir.pub/devops/benchmark #'
echo -e '# RUN-BenchMark-Script #'
echo -e '# '$MAIN_VERSION' #'
echo -e '# https://gitlab-ee.treesir.pub/devops/benchmark #'
echo -e '# ## ## ## ## ## ## ## ## ## ## ## ## ## ## ## ## ## #'
echo -e
@ -235,7 +236,7 @@ if [ ! -z $JSON ]; then
IPV6=$([ ! -z $IPV6_CHECK ] && echo "true" || echo "false")
AES=$([[ "$CPU_AES" = *Enabled* ]] && echo "true" || echo "false")
VIRT=$([[ "$CPU_VIRT" = *Enabled* ]] && echo "true" || echo "false")
JSON_RESULT='{"version":"'$YYDS_VERSION'","time":"'$TIME_START'","os":{"arch":"'$ARCH'","distro":"'$DISTRO'","kernel":"'$KERNEL'",'
JSON_RESULT='{"version":"'$MAIN_VERSION'","time":"'$TIME_START'","os":{"arch":"'$ARCH'","distro":"'$DISTRO'","kernel":"'$KERNEL'",'
JSON_RESULT+='"uptime":'$UPTIME_S'},"net":{"ipv4":'$IPV4',"ipv6":'$IPV6'},"cpu":{"model":"'$CPU_PROC'","cores":'$CPU_CORES','
JSON_RESULT+='"freq":"'$CPU_FREQ'","aes":'$AES',"virt":'$VIRT'},"mem":{"ram":'$TOTAL_RAM_RAW',"swap":'$TOTAL_SWAP_RAW',"disk":'$TOTAL_DISK_RAW'}'
fi
@ -767,17 +768,19 @@ function launch_geekbench {
if [[ "$ARCH" == *"x86"* ]]; then
# check if geekbench file exists
if test -f "geekbench.license"; then
$GEEKBENCH_PATH/geekbench_x86_32 --unlock `cat geekbench.license` > /dev/null 2>&1
fi
# if test -f "geekbench.license"; then
# $GEEKBENCH_PATH/geekbench_x86_32 --unlock `cat geekbench.license` > /dev/null 2>&1
# fi
$GEEKBENCH_PATH/geekbench_x86_32 --unlock ${GEEKBENCH_LICENSE} > /dev/null 2>&1
# run the Geekbench 4 test and grep the test results URL given at the end of the test
GEEKBENCH_TEST=$($GEEKBENCH_PATH/geekbench_x86_32 --no-upload 2>/dev/null | grep "https://browser")
else
# check if geekbench file exists
if test -f "geekbench.license"; then
$GEEKBENCH_PATH/geekbench4 --unlock `cat geekbench.license` > /dev/null 2>&1
fi
# if test -f "geekbench.license"; then
# $GEEKBENCH_PATH/geekbench4 --unlock `cat geekbench.license` > /dev/null 2>&1
# fi
$GEEKBENCH_PATH/geekbench4 --unlock ${GEEKBENCH_LICENSE} > /dev/null 2>&1
# run the Geekbench 4 test and grep the test results URL given at the end of the test
GEEKBENCH_TEST=$($GEEKBENCH_PATH/geekbench4 --upload 2>/dev/null | grep "https://browser")
@ -800,9 +803,10 @@ function launch_geekbench {
# fi
# check if geekbench file exists
if test -f "geekbench.license"; then
$GEEKBENCH_PATH/geekbench5 --unlock `cat geekbench.license` > /dev/null 2>&1
fi
# if test -f "geekbench.license"; then
# $GEEKBENCH_PATH/geekbench5 --unlock `cat geekbench.license` > /dev/null 2>&1
# fi
$GEEKBENCH_PATH/geekbench5 --unlock ${GEEKBENCH_LICENSE} > /dev/null 2>&1
GEEKBENCH_TEST=$($GEEKBENCH_PATH/geekbench5 --no-upload 2>/dev/null)
fi