Skip to content

Fix native CI waitpid assertion #693

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

Merged
aaf2tbz merged 1 commit into from
Sep 29, 2026
Merged

Fix native CI waitpid assertion #693

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
14 changes: 11 additions & 3 deletions app/src-c/tests/runtime_routes_test.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,14 @@
#include <sys/wait.h>
#include <unistd.h>

static void wait_for_test_child(pid_t child) {
pid_t result;
do {
result = waitpid(child, NULL, 0);
} while (result < 0 && errno == EINTR);
assert(result == child || (result < 0 && errno == ECHILD));
}

static void fixture(const char* home, const char* relative, const char* bytes) {
char* path = join(home, relative);
char* parent = strdup(path);
Expand Down Expand Up @@ -563,7 +571,7 @@ int main(int argc, char** argv) {
response = ms_process_kill_json(home, fallback_stop_body, strlen(fallback_stop_body), &status);
assert(response && status == 200 && strstr(response, "\"ok\":true"));
free(response);
assert(waitpid(wine_game, NULL, 0) == wine_game);
wait_for_test_child(wine_game);
free(wine_helper);
free(wine_bin);
}
Expand All @@ -582,7 +590,7 @@ int main(int argc, char** argv) {
response = ms_process_kill_json(home, untracked_stop_body, strlen(untracked_stop_body), &status);
assert(response && status == 200 && strstr(response, "\"ok\":true"));
free(response);
assert(waitpid(wine_game, NULL, 0) == wine_game);
wait_for_test_child(wine_game);
free(wine_helper);
}
{
Expand All @@ -599,7 +607,7 @@ int main(int argc, char** argv) {
response = ms_process_force_quit_json(home, &status);
assert(response && status == 200 && strstr(response, "\"pid\"") && strstr(response, "\"appid\":0"));
free(response);
assert(waitpid(wine_game, NULL, 0) == wine_game);
wait_for_test_child(wine_game);
free(wine_helper);
}
{
Expand Down
Loading