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.

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

0510 dep app #223

Merged
merged 2 commits into from
May 11, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
12 changes: 11 additions & 1 deletion BM/runtests
Original file line number Diff line number Diff line change
Expand Up @@ -107,11 +107,21 @@ init_dep_log() {
check_dep_cmd() {
local dep_info=$1
local dep=$2
local dep_cmd dep_reason
local dep_cmd dep_reason dep_app app

dep_cmd=$(echo "$dep_info" | awk -F "@" '{print $1}')
dep_reason=$(echo "$dep_info" | awk -F "@" '{print $2}')

# Avoid dependency check failure due to uncompiled app
dep_app=$(echo "$dep_info" | awk -F " " '{print $1}')
[[ "$dep_app" == *".sh" ]] || {
app=$(which "$dep_app" 2>/dev/null)
[[ -z "$app" ]] && {
REASON="The dependent app:$dep_app was not found and needs to be compiled first!"
return "$BLOCK_CODE"
}
}

# Execute ret not zero, will return below error code as failed
eval "$dep_cmd" 1>/dev/null || {
if [[ -z "$dep_reason" ]]; then
Expand Down
2 changes: 1 addition & 1 deletion BM/umip/umip_test_basic.c
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@
#endif

int test_passed, test_failed, test_errors;
sig_atomic_t got_signal, got_sigcode;
extern sig_atomic_t got_signal, got_sigcode;

static void call_sgdt(void)
{
Expand Down
Loading