From 70fbd3f17097ff67ab6e722ee4577adcafd25d21 Mon Sep 17 00:00:00 2001 From: bluhm Date: Fri, 21 May 2021 23:00:02 +0000 Subject: [PATCH] Ignore return value of execve(2) in ktrace output. It is meaningless. This fixes syslogd regress on powerpc64. discussed with kettenis@ --- regress/usr.sbin/syslogd/args-privsep.pl | 2 +- regress/usr.sbin/syslogd/args-sighup-config.pl | 2 +- regress/usr.sbin/syslogd/args-sighup-privsep.pl | 2 +- regress/usr.sbin/syslogd/args-sighup-tcp.pl | 2 +- regress/usr.sbin/syslogd/args-sighup-tls.pl | 2 +- regress/usr.sbin/syslogd/args-sighup.pl | 2 +- regress/usr.sbin/syslogd/args-sigpipe.pl | 2 +- regress/usr.sbin/syslogd/args-sigterm.pl | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/regress/usr.sbin/syslogd/args-privsep.pl b/regress/usr.sbin/syslogd/args-privsep.pl index e2f047be735..fe34d9eb42f 100644 --- a/regress/usr.sbin/syslogd/args-privsep.pl +++ b/regress/usr.sbin/syslogd/args-privsep.pl @@ -37,7 +37,7 @@ our %args = ( qr/syslogd CALL setresuid(.*"_syslogd".*){3}/ => 1, qr/syslogd CALL setresgid(.*"_syslogd".*){3}/ => 1, qr/syslogd CALL setsid/ => 0, - qr/syslogd RET execve 0/ => 2, + qr/syslogd RET execve \d+/ => 2, qr/\[\d\] = "-P"/ => 1, }, }, diff --git a/regress/usr.sbin/syslogd/args-sighup-config.pl b/regress/usr.sbin/syslogd/args-sighup-config.pl index cdf23e8fb60..32954e61cb3 100644 --- a/regress/usr.sbin/syslogd/args-sighup-config.pl +++ b/regress/usr.sbin/syslogd/args-sighup-config.pl @@ -20,7 +20,7 @@ our %args = ( syslogd => { ktrace => { qr/syslogd PSIG SIGHUP caught handler/ => 1, - qr/syslogd RET execve 0/ => 4, + qr/syslogd RET execve \d+/ => 4, }, loggrep => { qr/config file modified: restarting/ => 1, diff --git a/regress/usr.sbin/syslogd/args-sighup-privsep.pl b/regress/usr.sbin/syslogd/args-sighup-privsep.pl index f05c176569c..4eadf6d1b9b 100644 --- a/regress/usr.sbin/syslogd/args-sighup-privsep.pl +++ b/regress/usr.sbin/syslogd/args-sighup-privsep.pl @@ -20,7 +20,7 @@ our %args = ( syslogd => { ktrace => { qr/syslogd PSIG SIGHUP caught handler/ => 2, - qr/syslogd RET execve 0/ => 2, + qr/syslogd RET execve \d+/ => 2, }, loggrep => { qr/syslogd: restarted/ => 1, diff --git a/regress/usr.sbin/syslogd/args-sighup-tcp.pl b/regress/usr.sbin/syslogd/args-sighup-tcp.pl index bb939a606d5..0cabff530ec 100644 --- a/regress/usr.sbin/syslogd/args-sighup-tcp.pl +++ b/regress/usr.sbin/syslogd/args-sighup-tcp.pl @@ -25,7 +25,7 @@ our %args = ( }, ktrace => { qr/syslogd PSIG SIGHUP caught handler/ => 1, - qr/syslogd RET execve 0/ => 2, + qr/syslogd RET execve \d+/ => 2, }, loghost => '@tcp://127.0.0.1:$connectport', loggrep => { diff --git a/regress/usr.sbin/syslogd/args-sighup-tls.pl b/regress/usr.sbin/syslogd/args-sighup-tls.pl index 9b4071b6fcd..9375666c9ed 100644 --- a/regress/usr.sbin/syslogd/args-sighup-tls.pl +++ b/regress/usr.sbin/syslogd/args-sighup-tls.pl @@ -25,7 +25,7 @@ our %args = ( }, ktrace => { qr/syslogd PSIG SIGHUP caught handler/ => 1, - qr/syslogd RET execve 0/ => 2, + qr/syslogd RET execve \d+/ => 2, }, loghost => '@tls://127.0.0.1:$connectport', loggrep => { diff --git a/regress/usr.sbin/syslogd/args-sighup.pl b/regress/usr.sbin/syslogd/args-sighup.pl index ebf2df68d96..0f2a58a0026 100644 --- a/regress/usr.sbin/syslogd/args-sighup.pl +++ b/regress/usr.sbin/syslogd/args-sighup.pl @@ -20,7 +20,7 @@ our %args = ( syslogd => { ktrace => { qr/syslogd PSIG SIGHUP caught handler/ => 1, - qr/syslogd RET execve 0/ => 2, + qr/syslogd RET execve \d+/ => 2, }, loggrep => { qr/config file changed: dying/ => 0, diff --git a/regress/usr.sbin/syslogd/args-sigpipe.pl b/regress/usr.sbin/syslogd/args-sigpipe.pl index 9c638870cb6..d3c9a57b170 100644 --- a/regress/usr.sbin/syslogd/args-sigpipe.pl +++ b/regress/usr.sbin/syslogd/args-sigpipe.pl @@ -20,7 +20,7 @@ our %args = ( syslogd => { ktrace => { qr/syslogd PSIG SIGPIPE/ => 0, - qr/syslogd RET execve 0/ => 2, + qr/syslogd RET execve \d+/ => 2, }, loggrep => { get_between2loggrep() }, }, diff --git a/regress/usr.sbin/syslogd/args-sigterm.pl b/regress/usr.sbin/syslogd/args-sigterm.pl index b38447d3583..322559ab6ae 100644 --- a/regress/usr.sbin/syslogd/args-sigterm.pl +++ b/regress/usr.sbin/syslogd/args-sigterm.pl @@ -20,7 +20,7 @@ our %args = ( syslogd => { ktrace => { qr/syslogd PSIG SIGTERM caught handler/ => 1, - qr/syslogd RET execve 0/ => 2, + qr/syslogd RET execve \d+/ => 2, }, loggrep => { qr/syslogd: exited/ => 1, -- 2.20.1