redrsoe2100/mugen
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix：修改生成日志名称，便于不同平台传输日志

Browse Source 
(date +%Y-%m-%d-%T) 修改为 (date +%Y-%m-%d_%H-%M-%S)
生成名称由
2025-11-04-09:10:14.log -》 2025-11-04_09-10-14.log
兼容windows命名，便于不同平台传输日志
This commit is contained in:
SPYFAMILY
2025-11-04 21:16:42 +08:00
parent a51964241e
commit d7126d7505
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
mugen.sh
View File

@@ -161,7 +161,7 @@ function exec_case() {
exec 6>&1
exec 7>&2
exec >>"$log_path"/"$(date +%Y-%m-%d-%T)".log 2>&1
exec >>"$log_path"/"$(date +%Y-%m-%d_%H-%M-%S)".log 2>&1
SLEEP_WAIT $TIMEOUT "$cmd"
ret_code=$?
@@ -213,7 +213,7 @@ function run_test_case() {
. <(grep -vE '^main[[:space:]]*"\$@"' "${test_case}.sh")
# 新建重启日志日志直接写入文件
logfile="$log_path/reboot-$(date +%Y-%m-%d-%T).log"
logfile="$log_path/reboot-$(date +%Y-%m-%d_%H-%M-%S).log"
{
LOG_INFO ">>> Reboot"
post_test
@@ -262,13 +262,13 @@ function run_test_case() {
LOG_INFO "start to run testcase:$test_case."
if [ -z "${case_path[*]}" ]; then
echo -e "Can't find the test script:$test_case, Please confirm whether the code is submitted." >>"$log_path"/"$(date +%Y-%m-%d-%T)".log 2>&1
echo -e "Can't find the test script:$test_case, Please confirm whether the code is submitted." >>"$log_path"/"$(date +%Y-%m-%d_%H-%M-%S)".log 2>&1
exec_case "exit 255" "$log_path" "$test_case" "$test_suite"
return 1
else
CHECK_ENV "${OET_PATH}/suite2cases/$test_suite.json" "${test_case}"
if [ $? -ne 0 ]; then
echo -e "The test environment don't meet the requirements, please check your environment." >>"$log_path"/"$(date +%Y-%m-%d-%T)".log 2>&1
echo -e "The test environment don't meet the requirements, please check your environment." >>"$log_path"/"$(date +%Y-%m-%d_%H-%M-%S)".log 2>&1
exec_case "exit 255" "$log_path" "$test_case" "$test_suite"
return 1
fi

2
runoet.sh
View File

@@ -72,7 +72,7 @@ function exec_case() {
exec 6>&1
exec 7>&2
exec >"$log_path"/"$(date +%Y-%m-%d-%T)".log 2>&1
exec >"$log_path"/"$(date +%Y-%m-%d_%H-%M-%S)".log 2>&1
timeout --preserve-status $TIMEOUT $cmd
ret_code=$?