Add regress tests for str2sig() and sig2str().
This commit is contained in:
Todd C. Miller
1
MANIFEST
1
MANIFEST
@@ -134,6 +134,7 @@ lib/util/regress/glob/globtest.in
|
||||
lib/util/regress/mktemp/mktemp_test.c
|
||||
lib/util/regress/parse_gids/parse_gids_test.c
|
||||
lib/util/regress/progname/progname_test.c
|
||||
lib/util/regress/strsig/strsig_test.c
|
||||
lib/util/regress/strsplit/strsplit_test.c
|
||||
lib/util/regress/sudo_conf/conf_test.c
|
||||
lib/util/regress/sudo_conf/test1.in
|
||||
|
||||
5
configure
vendored
5
configure
vendored
@@ -722,6 +722,7 @@ timeout
|
||||
vardir
|
||||
rundir
|
||||
iolog_dir
|
||||
SIGNAME
|
||||
devsearch
|
||||
DIGEST
|
||||
exampledir
|
||||
@@ -3078,6 +3079,7 @@ $as_echo "$as_me: Configuring Sudo version $PACKAGE_VERSION" >&6;}
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
#
|
||||
@@ -3165,6 +3167,7 @@ INIT_SCRIPT=
|
||||
INIT_DIR=
|
||||
RC_LINK=
|
||||
COMPAT_EXP=
|
||||
SIGNAME=
|
||||
WEAK_ALIAS=no
|
||||
CHECKSHADOW=true
|
||||
shadow_funcs=
|
||||
@@ -22831,6 +22834,7 @@ done
|
||||
|
||||
|
||||
if test x"${ac_cv_func_sig2str}${ac_cv_func_str2sig}" != x"yesyes"; then
|
||||
COMPAT_TEST_PROGS="${COMPAT_TEST_PROGS}${COMPAT_TEST_PROGS+ }strsig_test"
|
||||
HAVE_SIGNAME="false"
|
||||
ac_fn_c_check_decl "$LINENO" "sys_signame" "ac_cv_have_decl_sys_signame" "
|
||||
$ac_includes_default
|
||||
@@ -22930,6 +22934,7 @@ $as_echo "$sudo_cv_var_sys_sigabbrev" >&6; }
|
||||
;;
|
||||
esac
|
||||
|
||||
SIGNAME=signame.lo
|
||||
fi
|
||||
fi
|
||||
fi
|
||||
|
||||
@@ -113,6 +113,7 @@ AC_SUBST([TMPFILES_D])
|
||||
AC_SUBST([exampledir])
|
||||
AC_SUBST([DIGEST])
|
||||
AC_SUBST([devsearch])
|
||||
AC_SUBST([SIGNAME])
|
||||
dnl
|
||||
dnl Variables that get substituted in docs (not overridden by environment)
|
||||
dnl
|
||||
@@ -245,6 +246,7 @@ INIT_SCRIPT=
|
||||
INIT_DIR=
|
||||
RC_LINK=
|
||||
COMPAT_EXP=
|
||||
SIGNAME=
|
||||
dnl
|
||||
dnl Other vaiables
|
||||
dnl
|
||||
@@ -3290,8 +3292,10 @@ AC_CHECK_FUNCS([str2sig], [], [
|
||||
|
||||
dnl
|
||||
dnl Check for sys_signame or sys_sigabbrev if missing sig2str() or str2sig().
|
||||
dnl Also enable unit tests for sig2str() and str2sig().
|
||||
dnl
|
||||
if test x"${ac_cv_func_sig2str}${ac_cv_func_str2sig}" != x"yesyes"; then
|
||||
COMPAT_TEST_PROGS="${COMPAT_TEST_PROGS}${COMPAT_TEST_PROGS+ }strsig_test"
|
||||
HAVE_SIGNAME="false"
|
||||
AC_CHECK_DECLS([sys_signame, _sys_signame, sys_sigabbrev], [
|
||||
HAVE_SIGNAME="true"
|
||||
@@ -3313,6 +3317,7 @@ AC_INCLUDES_DEFAULT
|
||||
AC_DEFINE(HAVE_SYS_SIGABBREV)
|
||||
else
|
||||
AC_LIBOBJ(signame)
|
||||
SIGNAME=signame.lo
|
||||
fi
|
||||
fi
|
||||
fi
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
#
|
||||
# SPDX-License-Identifier: ISC
|
||||
#
|
||||
# Copyright (c) 2011-2018 Todd C. Miller <Todd.Miller@sudo.ws>
|
||||
# Copyright (c) 2011-2019 Todd C. Miller <Todd.Miller@sudo.ws>
|
||||
#
|
||||
# Permission to use, copy, modify, and distribute this software for any
|
||||
# purpose with or without fee is hereby granted, provided that the above
|
||||
@@ -148,6 +148,8 @@ PARSE_GIDS_TEST_OBJS = parse_gids_test.lo gidlist.lo
|
||||
|
||||
GETGROUPLIST_TEST_OBJS = getgrouplist_test.lo getgrouplist.lo
|
||||
|
||||
STRSIG_TEST_OBJS = strsig_test.lo sig2str.lo str2sig.lo @SIGNAME@
|
||||
|
||||
VSYSLOG_TEST_OBJS = vsyslog_test.lo vsyslog.lo
|
||||
|
||||
all: libsudo_util.la
|
||||
@@ -243,6 +245,9 @@ getgrouplist_test: $(GETGROUPLIST_TEST_OBJS) libsudo_util.la
|
||||
strsplit_test: $(STRSPLIT_TEST_OBJS) libsudo_util.la
|
||||
$(LIBTOOL) $(LTFLAGS) --mode=link $(CC) -o $@ $(STRSPLIT_TEST_OBJS) libsudo_util.la $(ASAN_LDFLAGS) $(PIE_LDFLAGS) $(SSP_LDFLAGS) $(TEST_LDFLAGS) $(TEST_LIBS)
|
||||
|
||||
strsig_test: $(STRSIG_TEST_OBJS) libsudo_util.la
|
||||
$(LIBTOOL) $(LTFLAGS) --mode=link $(CC) -o $@ $(STRSIG_TEST_OBJS) libsudo_util.la $(ASAN_LDFLAGS) $(PIE_LDFLAGS) $(SSP_LDFLAGS) $(TEST_LDFLAGS) $(TEST_LIBS)
|
||||
|
||||
vsyslog_test: $(VSYSLOG_TEST_OBJS) libsudo_util.la
|
||||
$(LIBTOOL) $(LTFLAGS) --mode=link $(CC) -o $@ $(VSYSLOG_TEST_OBJS) libsudo_util.la $(ASAN_LDFLAGS) $(PIE_LDFLAGS) $(SSP_LDFLAGS) $(TEST_LDFLAGS) $(TEST_LIBS)
|
||||
|
||||
@@ -308,6 +313,9 @@ check: $(TEST_PROGS)
|
||||
if test -f mktemp_test; then \
|
||||
./mktemp_test || rval=`expr $$rval + $$?`; \
|
||||
fi; \
|
||||
if test -f strsig_test; then \
|
||||
./strsig_test || rval=`expr $$rval + $$?`; \
|
||||
fi; \
|
||||
./getgrouplist_test || rval=`expr $$rval + $$?`; \
|
||||
./atofoo_test || rval=`expr $$rval + $$?`; \
|
||||
./hltq_test || rval=`expr $$rval + $$?`; \
|
||||
@@ -968,6 +976,18 @@ strnlen.i: $(srcdir)/strnlen.c $(incdir)/sudo_compat.h $(top_builddir)/config.h
|
||||
$(CC) -E -o $@ $(CPPFLAGS) $<
|
||||
strnlen.plog: strnlen.i
|
||||
rm -f $@; pvs-studio --cfg $(PVS_CFG) --sourcetree-root $(top_srcdir) --skip-cl-exe yes --source-file $(srcdir)/strnlen.c --i-file $< --output-file $@
|
||||
strsig_test.lo: $(srcdir)/regress/strsig/strsig_test.c \
|
||||
$(incdir)/compat/stdbool.h $(incdir)/sudo_compat.h \
|
||||
$(incdir)/sudo_fatal.h $(incdir)/sudo_util.h \
|
||||
$(top_builddir)/config.h
|
||||
$(LIBTOOL) $(LTFLAGS) --mode=compile $(CC) -c -o $@ $(CPPFLAGS) $(CFLAGS) $(ASAN_CFLAGS) $(PIE_CFLAGS) $(SSP_CFLAGS) $(srcdir)/regress/strsig/strsig_test.c
|
||||
strsig_test.i: $(srcdir)/regress/strsig/strsig_test.c \
|
||||
$(incdir)/compat/stdbool.h $(incdir)/sudo_compat.h \
|
||||
$(incdir)/sudo_fatal.h $(incdir)/sudo_util.h \
|
||||
$(top_builddir)/config.h
|
||||
$(CC) -E -o $@ $(CPPFLAGS) $<
|
||||
strsig_test.plog: strsig_test.i
|
||||
rm -f $@; pvs-studio --cfg $(PVS_CFG) --sourcetree-root $(top_srcdir) --skip-cl-exe yes --source-file $(srcdir)/regress/strsig/strsig_test.c --i-file $< --output-file $@
|
||||
strsignal.lo: $(srcdir)/strsignal.c $(incdir)/sudo_compat.h \
|
||||
$(incdir)/sudo_gettext.h $(top_builddir)/config.h
|
||||
$(LIBTOOL) $(LTFLAGS) --mode=compile $(CC) -c -o $@ $(CPPFLAGS) $(CFLAGS) $(ASAN_CFLAGS) $(PIE_CFLAGS) $(SSP_CFLAGS) $(srcdir)/strsignal.c
|
||||
|
||||
312
lib/util/regress/strsig/strsig_test.c
Normal file
312
lib/util/regress/strsig/strsig_test.c
Normal file
@@ -0,0 +1,312 @@
|
||||
/*
|
||||
* SPDX-License-Identifier: ISC
|
||||
*
|
||||
* Copyright (c) 2019 Todd C. Miller <Todd.Miller@sudo.ws>
|
||||
*
|
||||
* Permission to use, copy, modify, and distribute this software for any
|
||||
* purpose with or without fee is hereby granted, provided that the above
|
||||
* copyright notice and this permission notice appear in all copies.
|
||||
*
|
||||
* THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
|
||||
* WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
|
||||
* MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
|
||||
* ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
|
||||
* WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
|
||||
* ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
|
||||
* OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
|
||||
*/
|
||||
|
||||
#include <config.h>
|
||||
|
||||
#include <sys/types.h>
|
||||
#include <stdio.h>
|
||||
#include <stdlib.h>
|
||||
#include <signal.h>
|
||||
#include <string.h>
|
||||
#ifdef HAVE_STDBOOL_H
|
||||
# include <stdbool.h>
|
||||
#else
|
||||
# include "compat/stdbool.h"
|
||||
#endif
|
||||
|
||||
#include "sudo_compat.h"
|
||||
#include "sudo_util.h"
|
||||
#include "sudo_fatal.h"
|
||||
|
||||
__dso_public int main(int argc, char *argv[]);
|
||||
|
||||
/*
|
||||
* Note: we do not test SIGUNUSED as it may not appear in sys_sigabbrev[]
|
||||
* on Linux.
|
||||
*/
|
||||
static struct signal_data {
|
||||
int rval;
|
||||
int signo;
|
||||
const char *sigstr;
|
||||
const char *altstr;
|
||||
} signal_data[] = {
|
||||
#ifdef SIGHUP
|
||||
{ 0, SIGHUP, "HUP", NULL },
|
||||
#endif
|
||||
#ifdef SIGINT
|
||||
{ 0, SIGINT, "INT", NULL },
|
||||
#endif
|
||||
#ifdef SIGQUIT
|
||||
{ 0, SIGQUIT, "QUIT", NULL },
|
||||
#endif
|
||||
#ifdef SIGILL
|
||||
{ 0, SIGILL, "ILL", NULL },
|
||||
#endif
|
||||
#ifdef SIGTRAP
|
||||
{ 0, SIGTRAP, "TRAP", NULL },
|
||||
#endif
|
||||
#ifdef SIGABRT
|
||||
{ 0, SIGABRT, "ABRT", "IOT" },
|
||||
#endif
|
||||
#ifdef SIGIOT
|
||||
{ 0, SIGIOT, "IOT", "ABRT" },
|
||||
#endif
|
||||
#ifdef SIGEMT
|
||||
{ 0, SIGEMT, "EMT", NULL },
|
||||
#endif
|
||||
#ifdef SIGFPE
|
||||
{ 0, SIGFPE, "FPE", NULL },
|
||||
#endif
|
||||
#ifdef SIGKILL
|
||||
{ 0, SIGKILL, "KILL", NULL },
|
||||
#endif
|
||||
#ifdef SIGBUS
|
||||
{ 0, SIGBUS, "BUS", NULL },
|
||||
#endif
|
||||
#ifdef SIGSEGV
|
||||
{ 0, SIGSEGV, "SEGV", NULL },
|
||||
#endif
|
||||
#ifdef SIGSYS
|
||||
{ 0, SIGSYS, "SYS", NULL },
|
||||
#endif
|
||||
#ifdef SIGPIPE
|
||||
{ 0, SIGPIPE, "PIPE", NULL },
|
||||
#endif
|
||||
#ifdef SIGALRM
|
||||
{ 0, SIGALRM, "ALRM", NULL },
|
||||
#endif
|
||||
#ifdef SIGTERM
|
||||
{ 0, SIGTERM, "TERM", NULL },
|
||||
#endif
|
||||
#ifdef SIGSTKFLT
|
||||
{ 0, SIGSTKFLT, "STKFLT", NULL },
|
||||
#endif
|
||||
#ifdef SIGIO
|
||||
{ 0, SIGIO, "IO", "POLL"},
|
||||
#endif
|
||||
#ifdef SIGXCPU
|
||||
{ 0, SIGXCPU, "XCPU", NULL },
|
||||
#endif
|
||||
#ifdef SIGXFSZ
|
||||
{ 0, SIGXFSZ, "XFSZ", NULL },
|
||||
#endif
|
||||
#ifdef SIGVTALRM
|
||||
{ 0, SIGVTALRM, "VTALRM", NULL },
|
||||
#endif
|
||||
#ifdef SIGPROF
|
||||
{ 0, SIGPROF, "PROF", NULL },
|
||||
#endif
|
||||
#ifdef SIGWINCH
|
||||
{ 0, SIGWINCH, "WINCH", NULL },
|
||||
#endif
|
||||
#ifdef SIGLOST
|
||||
{ 0, SIGLOST, "LOST", NULL },
|
||||
#endif
|
||||
#ifdef SIGUSR1
|
||||
{ 0, SIGUSR1, "USR1", NULL },
|
||||
#endif
|
||||
#ifdef SIGUSR2
|
||||
{ 0, SIGUSR2, "USR2", NULL },
|
||||
#endif
|
||||
#ifdef SIGPWR
|
||||
{ 0, SIGPWR, "PWR", NULL },
|
||||
#endif
|
||||
#ifdef SIGPOLL
|
||||
{ 0, SIGPOLL, "POLL", "IO" },
|
||||
#endif
|
||||
#ifdef SIGSTOP
|
||||
{ 0, SIGSTOP, "STOP", NULL },
|
||||
#endif
|
||||
#ifdef SIGTSTP
|
||||
{ 0, SIGTSTP, "TSTP", NULL },
|
||||
#endif
|
||||
#ifdef SIGCONT
|
||||
{ 0, SIGCONT, "CONT", NULL },
|
||||
#endif
|
||||
#ifdef SIGCHLD
|
||||
{ 0, SIGCHLD, "CHLD", "CLD" },
|
||||
#endif
|
||||
#ifdef SIGCLD
|
||||
{ 0, SIGCLD, "CLD", "CHLD" },
|
||||
#endif
|
||||
#ifdef SIGTTIN
|
||||
{ 0, SIGTTIN, "TTIN", NULL },
|
||||
#endif
|
||||
#ifdef SIGTTOU
|
||||
{ 0, SIGTTOU, "TTOU", NULL },
|
||||
#endif
|
||||
#ifdef SIGINFO
|
||||
{ 0, SIGINFO, "INFO", NULL },
|
||||
#endif
|
||||
#ifdef SIGURG
|
||||
{ 0, SIGURG, "URG", NULL },
|
||||
#endif
|
||||
#ifdef SIGWAITING
|
||||
{ 0, SIGWAITING, "WAITING", NULL },
|
||||
#endif
|
||||
#ifdef SIGLWP
|
||||
{ 0, SIGLWP, "LWP", NULL },
|
||||
#endif
|
||||
#ifdef SIGFREEZE
|
||||
{ 0, SIGFREEZE, "FREEZE", NULL },
|
||||
#endif
|
||||
#ifdef SIGTHAW
|
||||
{ 0, SIGTHAW, "THAW", NULL },
|
||||
#endif
|
||||
#ifdef SIGCANCEL
|
||||
{ 0, SIGCANCEL, "CANCEL", NULL },
|
||||
#endif
|
||||
#if defined(SIGRTMIN) && defined(SIGRTMAX)
|
||||
{ 0, -1, "RTMIN", NULL },
|
||||
{ 0, -1, "RTMIN+1", NULL },
|
||||
{ 0, -1, "RTMIN+2", NULL },
|
||||
{ 0, -1, "RTMIN+3", NULL },
|
||||
{ 0, -1, "RTMAX-3", NULL },
|
||||
{ 0, -1, "RTMAX-2", NULL },
|
||||
{ 0, -1, "RTMAX-1", NULL },
|
||||
{ 0, -1, "RTMAX", NULL },
|
||||
#endif
|
||||
{ -1, 1024, "QWERT", NULL }, /* invalid */
|
||||
{ -1, 0, NULL, NULL }
|
||||
};
|
||||
|
||||
#ifndef HAVE_SIG2STR
|
||||
static int
|
||||
test_sig2str(int *ntests)
|
||||
{
|
||||
struct signal_data *d;
|
||||
int rval, errors = 0;
|
||||
char sigstr[SIG2STR_MAX];
|
||||
|
||||
for (d = signal_data; d->signo != 0; d++) {
|
||||
(*ntests)++;
|
||||
rval = sudo_sig2str(d->signo, sigstr);
|
||||
if (rval != d->rval) {
|
||||
sudo_warnx_nodebug("FAIL: sig2str(SIG%s): %d != %d",
|
||||
d->sigstr, rval, d->rval);
|
||||
errors++;
|
||||
continue;
|
||||
}
|
||||
if (rval != 0)
|
||||
continue;
|
||||
if (strcmp(sigstr, d->sigstr) != 0 &&
|
||||
(d->altstr != NULL && strcmp(sigstr, d->altstr) != 0)) {
|
||||
sudo_warnx_nodebug("FAIL: signal %d: %s != %s", d->signo,
|
||||
sigstr, d->sigstr);
|
||||
errors++;
|
||||
continue;
|
||||
}
|
||||
}
|
||||
|
||||
return errors;
|
||||
}
|
||||
#else
|
||||
static int
|
||||
test_sig2str(int *ntests)
|
||||
{
|
||||
return 0;
|
||||
}
|
||||
#endif /* HAVE_SIG2STR */
|
||||
|
||||
#ifndef HAVE_STR2SIG
|
||||
static int
|
||||
test_str2sig(int *ntests)
|
||||
{
|
||||
struct signal_data *d;
|
||||
int rval, errors = 0;
|
||||
int signo;
|
||||
|
||||
for (d = signal_data; d->sigstr != NULL; d++) {
|
||||
(*ntests)++;
|
||||
rval = sudo_str2sig(d->sigstr, &signo);
|
||||
if (rval != d->rval) {
|
||||
sudo_warnx_nodebug("FAIL: str2sig(SIG%s): %d != %d",
|
||||
d->sigstr, rval, d->rval);
|
||||
errors++;
|
||||
continue;
|
||||
}
|
||||
if (rval != 0)
|
||||
continue;
|
||||
if (signo != d->signo) {
|
||||
sudo_warnx_nodebug("FAIL: signal SIG%s: %d != %d", d->sigstr,
|
||||
signo, d->signo);
|
||||
errors++;
|
||||
continue;
|
||||
}
|
||||
}
|
||||
|
||||
return errors;
|
||||
}
|
||||
#else
|
||||
static int
|
||||
test_str2sig(int *ntests)
|
||||
{
|
||||
return 0;
|
||||
}
|
||||
#endif /* HAVE_STR2SIG */
|
||||
|
||||
#if defined(SIGRTMIN) && defined(SIGRTMAX)
|
||||
static
|
||||
void init_sigrt(void)
|
||||
{
|
||||
int i;
|
||||
|
||||
/* Initialize real-time signal values. */
|
||||
for (i = 0; signal_data[i].signo != -1; i++)
|
||||
continue;
|
||||
signal_data[i++].signo = SIGRTMIN;
|
||||
signal_data[i++].signo = SIGRTMIN + 1;
|
||||
signal_data[i++].signo = SIGRTMIN + 2;
|
||||
signal_data[i++].signo = SIGRTMIN + 3;
|
||||
signal_data[i++].signo = SIGRTMAX - 3;
|
||||
signal_data[i++].signo = SIGRTMAX - 2;
|
||||
signal_data[i++].signo = SIGRTMAX - 1;
|
||||
signal_data[i++].signo = SIGRTMAX;
|
||||
|
||||
}
|
||||
#else
|
||||
static
|
||||
void init_sigrt(void)
|
||||
{
|
||||
/* No real-time signals. */
|
||||
return;
|
||||
}
|
||||
#endif
|
||||
|
||||
/*
|
||||
* Simple tests for sig2str() and str2sig().
|
||||
*/
|
||||
int
|
||||
main(int argc, char *argv[])
|
||||
{
|
||||
int errors = 0;
|
||||
int ntests = 0;
|
||||
|
||||
initprogname(argc > 0 ? argv[0] : "strsig_test");
|
||||
|
||||
init_sigrt();
|
||||
errors += test_sig2str(&ntests);
|
||||
errors += test_str2sig(&ntests);
|
||||
|
||||
if (ntests != 0) {
|
||||
printf("%s: %d tests run, %d errors, %d%% success rate\n",
|
||||
getprogname(), ntests, errors, (ntests - errors) * 100 / ntests);
|
||||
}
|
||||
|
||||
exit(errors);
|
||||
}
|
||||
Reference in New Issue
Block a user