Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

0802 improve #346

Merged
merged 2 commits into from
Aug 2, 2024
Merged

0802 improve #346

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9330214
runtests: will continue if cmdfile is illegal
xupengfe Aug 2, 2024
8e378ee
runtests: improve dependency steps to generate expected dependency su…
xupengfe Aug 2, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 7 additions & 10 deletions BM/runtests
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -400,9 +400,10 @@ run_tests() {

check_dep_feature "$cmdfile" || {
append_log "Skip $cmdfile due to dependece, please check $DEP_LOG" "$LOGFILE"
DEP_EXIT=$BLOCK_CODE
continue
}

append_log "Next run cases from $cmdfile" "$LOGFILE"
runcmdfile "$cmdfile" "$LOGFILE"
done

Expand All @@ -429,7 +430,7 @@ while getopts ":o:d:f:t:s:c:h" opt; do
[[ "$CMDFILES" == "$TESTS_SERVER" ]] && list_all_test_files "$CMDFILES"

for cmdfile in $(tr "," " " <<< "$CMDFILES"); do
check_test_file_legal "$cmdfile"
check_test_file_legal "$cmdfile" || continue

check_dep_feature "$cmdfile" || {
append_log "Skip $cmdfile due to dependece, please check $DEP_LOG" "$LOGFILE"
Expand All @@ -453,15 +454,11 @@ while getopts ":o:d:f:t:s:c:h" opt; do
SCENARIO_FOLDER=$OPTARG
[[ -d "$SCENARIO_FOLDER" ]] || usage
test_files=$(find "$SCENARIO_FOLDER" -name "tests-*")
[[ -z "$test_files" ]] && append_log "No tests-* files under $SCENARIO_FOLDER"
[[ -z "$test_files" ]] && {
append_log "No tests-* files under $SCENARIO_FOLDER"
exit 2
}
for cmdfile in $test_files; do
check_test_file_legal "$cmdfile"

check_dep_feature "$cmdfile" || {
append_log "Skip $cmdfile due to dependece, please check $DEP_LOG" "$LOGFILE"
DEP_EXIT=$BLOCK_CODE
continue
}
CMDFILES="$CMDFILES,$cmdfile"
done
;;
Expand Down
Loading