Skip to content

Commit 25bbab5

Browse files
aescolarChromeos LUCI
authored and
Chromeos LUCI
committed
Revert "tests: posix: headers: add checks for posix signals option group"
This reverts commit 308322e. PR zephyrproject-rtos#73978 introduced a regression. Unfortunately this PR cannot be reverted without reverting also Let's revert both PRs to stabilize main again towards the 3.7 release. For more details on the issue see zephyrproject-rtos#75205 (cherry picked from commit 0642737) Original-Signed-off-by: Alberto Escolar Piedras <[email protected]> GitOrigin-RevId: 0642737 Change-Id: I832e331b28a571c1131a0eb36b135a1ec315356e Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/third_party/zephyr/+/5678570 Tested-by: ChromeOS Prod (Robot) <[email protected]> Commit-Queue: Fabio Baltieri <[email protected]> Reviewed-by: Fabio Baltieri <[email protected]>
1 parent 694ff3b commit 25bbab5

File tree

1 file changed

+27
-38
lines changed

1 file changed

+27
-38
lines changed

tests/posix/headers/src/signal_h.c

+27-38
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,6 @@
66

77
#include "_common.h"
88

9-
#include <stdlib.h>
10-
119
#ifdef CONFIG_POSIX_API
1210
#include <signal.h>
1311
#else
@@ -21,17 +19,13 @@
2119
*/
2220
ZTEST(posix_headers, test_signal_h)
2321
{
24-
typedef void *(*my_sig_handler_t)(int signo);
25-
26-
my_sig_handler_t handler;
27-
28-
handler = SIG_DFL;
29-
handler = SIG_ERR;
30-
handler = SIG_IGN;
22+
/* zassert_not_equal(-1, SIG_DFL); */ /* not implemented */
23+
/* zassert_not_equal(-1, SIG_ERR); */ /* not implemented */
3124
/* zassert_not_equal(-1, SIG_HOLD); */ /* not implemented */
25+
/* zassert_not_equal(-1, SIG_IGN); */ /* not implemented */
3226

3327
zassert_not_equal((sig_atomic_t)-1, (sig_atomic_t)0);
34-
zassert_not_equal((pid_t)-1, (pid_t)0);
28+
/* zassert_not_equal((pid_t)-1, (pid_t)0); */ /* not implemented */
3529

3630
zassert_not_equal(-1, offsetof(struct sigevent, sigev_notify));
3731
zassert_not_equal(-1, offsetof(struct sigevent, sigev_signo));
@@ -53,15 +47,6 @@ ZTEST(posix_headers, test_signal_h)
5347
zassert_not_equal(-1, SIG_UNBLOCK);
5448
zassert_not_equal(-1, SIG_SETMASK);
5549

56-
zassert_not_equal(-1, offsetof(struct sigaction, sa_handler));
57-
zassert_not_equal(-1, offsetof(struct sigaction, sa_mask));
58-
zassert_not_equal(-1, offsetof(struct sigaction, sa_flags));
59-
zassert_not_equal(-1, offsetof(struct sigaction, sa_sigaction));
60-
61-
zassert_not_equal(-1, offsetof(siginfo_t, si_signo));
62-
zassert_not_equal(-1, offsetof(siginfo_t, si_code));
63-
zassert_not_equal(-1, offsetof(siginfo_t, si_value));
64-
6550
/* zassert_not_equal(-1, SA_NOCLDSTOP); */ /* not implemented */
6651
/* zassert_not_equal(-1, SA_ONSTACK); */ /* not implemented */
6752
/* zassert_not_equal(-1, SA_RESETHAND); */ /* not implemented */
@@ -132,11 +117,18 @@ ZTEST(posix_headers, test_signal_h)
132117
/* zassert_not_equal(-1, CLD_STOPPED); */ /* not implemented */
133118
/* zassert_not_equal(-1, CLD_CONTINUED); */ /* not implemented */
134119

135-
zassert_not_equal(-1, SI_USER);
136-
zassert_not_equal(-1, SI_QUEUE);
137-
zassert_not_equal(-1, SI_TIMER);
138-
zassert_not_equal(-1, SI_ASYNCIO);
139-
zassert_not_equal(-1, SI_MESGQ);
120+
/* zassert_not_equal(-1, POLL_IN); */ /* not implemented */
121+
/* zassert_not_equal(-1, POLL_OUT); */ /* not implemented */
122+
/* zassert_not_equal(-1, POLL_MSG); */ /* not implemented */
123+
/* zassert_not_equal(-1, POLL_ERR); */ /* not implemented */
124+
/* zassert_not_equal(-1, POLL_PRI); */ /* not implemented */
125+
/* zassert_not_equal(-1, POLL_HUP); */ /* not implemented */
126+
127+
/* zassert_not_equal(-1, SI_USER); */ /* not implemented */
128+
/* zassert_not_equal(-1, SI_QUEUE); */ /* not implemented */
129+
/* zassert_not_equal(-1, SI_TIMER); */ /* not implemented */
130+
/* zassert_not_equal(-1, SI_ASYNCIO); */ /* not implemented */
131+
/* zassert_not_equal(-1, SI_MESGQ); */ /* not implemented */
140132

141133
#ifdef CONFIG_POSIX_SIGNALS
142134
zassert_true(SIGRTMIN >= 0);
@@ -166,40 +158,37 @@ ZTEST(posix_headers, test_signal_h)
166158
zassert_not_equal(-1, SIGXCPU);
167159
zassert_not_equal(-1, SIGXFSZ);
168160
zassert_not_equal(((sigset_t){.sig[0] = 0}).sig[0], ((sigset_t){.sig[0] = -1}).sig[0]);
169-
zassert_not_null(abort);
170-
zassert_not_null(alarm);
171-
zassert_not_null(kill);
172-
zassert_not_null(pause);
173-
zassert_not_null(pthread_sigmask);
174-
zassert_not_null(raise);
175-
zassert_not_null(sigaction);
176-
zassert_not_null(sigaddset);
177-
zassert_not_null(sigdelset);
178161
zassert_not_null(sigemptyset);
179162
zassert_not_null(sigfillset);
163+
zassert_not_null(sigaddset);
164+
zassert_not_null(sigdelset);
180165
zassert_not_null(sigismember);
181-
zassert_not_null(signal);
182-
zassert_not_null(sigpending);
183-
zassert_not_null(sigprocmask);
184-
zassert_not_null(sigsuspend);
185-
zassert_not_null(sigwait);
186166
zassert_not_null(strsignal);
167+
zassert_not_null(sigprocmask);
168+
zassert_not_null(pthread_sigmask);
187169
#endif /* CONFIG_POSIX_SIGNALS */
188170

189171
if (IS_ENABLED(CONFIG_POSIX_API)) {
172+
/* zassert_not_null(kill); */ /* not implemented */
190173
/* zassert_not_null(killpg); */ /* not implemented */
191174
/* zassert_not_null(psiginfo); */ /* not implemented */
192175
/* zassert_not_null(psignal); */ /* not implemented */
193176
/* zassert_not_null(pthread_kill); */ /* not implemented */
177+
/* zassert_not_null(raise); */ /* not implemented */
178+
/* zassert_not_null(sigaction); */ /* not implemented */
194179
/* zassert_not_null(sigaltstack); */ /* not implemented */
195180
/* zassert_not_null(sighold); */ /* not implemented */
196181
/* zassert_not_null(sigignore); */ /* not implemented */
197182
/* zassert_not_null(siginterrupt); */ /* not implemented */
183+
/* zassert_not_null(signal); */ /* not implemented */
198184
/* zassert_not_null(sigpause); */ /* not implemented */
185+
/* zassert_not_null(sigpending); */ /* not implemented */
199186
/* zassert_not_null(sigqueue); */ /* not implemented */
200187
/* zassert_not_null(sigrelse); */ /* not implemented */
201188
/* zassert_not_null(sigset); */ /* not implemented */
189+
/* zassert_not_null(sigsuspend); */ /* not implemented */
202190
/* zassert_not_null(sigtimedwait); */ /* not implemented */
191+
/* zassert_not_null(sigwait); */ /* not implemented */
203192
/* zassert_not_null(sigwaitinfo); */ /* not implemented */
204193
}
205194
}

0 commit comments

Comments
 (0)