github/xrdp
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Rename struct exit_status in os_calls

Browse Source 
This conflicts with struct exit_status in <utmp.h>
This commit is contained in:
matt335672
2023-06-29 15:20:39 +01:00
parent 49f60fc64f
commit bc9b35c38c
8 changed files with 42 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tests/common/test_os_calls_signals.c
+7 -7
View File
@@ -79,7 +79,7 @@ END_TEST
/******************************************************************************/
START_TEST(test_g_signal_child_stop_1)
{
struct exit_status e;
struct proc_exit_status e;
g_reset_wait_obj(g_wobj1);
ck_assert_int_eq(g_is_wait_obj_set(g_wobj1), 0);
@@ -98,7 +98,7 @@ START_TEST(test_g_signal_child_stop_1)
e = g_waitpid_status(pid);
ck_assert_int_eq(e.reason, E_XR_STATUS_CODE);
ck_assert_int_eq(e.reason, E_PXR_STATUS_CODE);
ck_assert_int_eq(e.val, 45);
// Try another one to make sure the signal handler is still in place.
@@ -116,7 +116,7 @@ START_TEST(test_g_signal_child_stop_1)
e = g_waitpid_status(pid);
ck_assert_int_eq(e.reason, E_XR_SIGNAL);
ck_assert_int_eq(e.reason, E_PXR_SIGNAL);
ck_assert_int_eq(e.val, SIGSEGV);
// Clean up
@@ -133,7 +133,7 @@ START_TEST(test_g_signal_child_stop_2)
int pids[CHILD_COUNT];
unsigned int i;
struct exit_status e;
struct proc_exit_status e;
g_reset_wait_obj(g_wobj1);
ck_assert_int_eq(g_is_wait_obj_set(g_wobj1), 0);
@@ -157,7 +157,7 @@ START_TEST(test_g_signal_child_stop_2)
for (i = 0 ; i < CHILD_COUNT; ++i)
{
e = g_waitpid_status(pids[i]);
ck_assert_int_eq(e.reason, E_XR_STATUS_CODE);
ck_assert_int_eq(e.reason, E_PXR_STATUS_CODE);
ck_assert_int_eq(e.val, (i + 1));
}
@@ -246,12 +246,12 @@ START_TEST(test_waitpid_not_interrupted_by_sig)
g_reset_wait_obj(g_wobj1);
g_set_alarm(set_wobj1, 1);
struct exit_status e = g_waitpid_status(child_pid);
struct proc_exit_status e = g_waitpid_status(child_pid);
// We should have had the alarm...
ck_assert_int_ne(g_is_wait_obj_set(g_wobj1), 0);
// ..and got the status of the child
ck_assert_int_eq(e.reason, E_XR_STATUS_CODE);
ck_assert_int_eq(e.reason, E_PXR_STATUS_CODE);
ck_assert_int_eq(e.val, 42);
// Clean up