gre-ilya/libuv
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix exit status checking in test-runner-unix

Browse Source
This commit is contained in:
Ryan Dahl 2011-04-14 13:15:48 -07:00
parent 769948a5ad
commit 7ed7bb34b0
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
test/test-runner-unix.c
View File

@ -32,6 +32,7 @@ int process_start(char* name, process_info_t* p) {
} }
p->terminated = 0; p->terminated = 0;
p->status = 0;
get_executable_path(); get_executable_path();
@ -72,7 +73,7 @@ int process_wait(process_info_t* vec, int n, int timeout) {
p = (process_info_t*)(vec + i * sizeof(process_info_t)); p = (process_info_t*)(vec + i * sizeof(process_info_t));
if (p->terminated) continue; if (p->terminated) continue;
int status = 0; int status = 0;
int r = waitpid(p->pid, &p->status, 0); int r = waitpid(p->pid, &(p->status), 0);
if (r < 0) { if (r < 0) {
return -1; return -1;
} }
@ -140,7 +141,11 @@ int process_terminate(process_info_t *p) {
/* Return the exit code of process p. */ /* Return the exit code of process p. */
/* On error, return -1. */ /* On error, return -1. */
int process_reap(process_info_t *p) { int process_reap(process_info_t *p) {
return WEXITSTATUS(p->status); if (WIFEXITED(p->status)) {
return WEXITSTATUS(p->status);
} else {
return p->status; /* ? */
}
} }