cope with ktrace "(via syscall)" changes

diff --git a/regress/usr.sbin/syslogd/args-sendsyslog-console.pl b/regress/usr.sbin/syslogd/args-sendsyslog-console.pl
index 9c5a1aa..a213138 100644 (file)
--- a/regress/usr.sbin/syslogd/args-sendsyslog-console.pl
+++ b/regress/usr.sbin/syslogd/args-sendsyslog-console.pl
@@ -32,7 +32,7 @@ our %args = (
            write_shutdown($self);
        },
        ktrace => {
-           qr/CALL  sendsyslog\(/ => 18,
+           qr/CALL  (\(via syscall\) )?sendsyslog\(/ => 18,
            qr/GIO   fd -1 wrote /.length(get_testlog()).qr/ bytes/ => 2,
            qr/RET   sendsyslog -1 errno $errno / => 18,
        },

diff --git a/regress/usr.sbin/syslogd/args-sendsyslog-fault.pl b/regress/usr.sbin/syslogd/args-sendsyslog-fault.pl
index 6386ff2..fba8efb 100644 (file)
--- a/regress/usr.sbin/syslogd/args-sendsyslog-fault.pl
+++ b/regress/usr.sbin/syslogd/args-sendsyslog-fault.pl
@@ -27,7 +27,7 @@ our %args = (
            write_log($self);
        },
        ktrace => {
-           qr/CALL  sendsyslog\(/ => 3,
+           qr/CALL  (\(via syscall\) )?sendsyslog\(/ => 3,
            qr/RET   sendsyslog -1 errno $errno / => 1,
        },
        loggrep => {

diff --git a/regress/usr.sbin/syslogd/args-sendsyslog-flags.pl b/regress/usr.sbin/syslogd/args-sendsyslog-flags.pl
index b9c54af..6c52605 100644 (file)
--- a/regress/usr.sbin/syslogd/args-sendsyslog-flags.pl
+++ b/regress/usr.sbin/syslogd/args-sendsyslog-flags.pl
@@ -14,7 +14,7 @@ our %args = (
     client => {
        connect => { domain => "sendsyslog", flags => LOG_CONS },
        ktrace => {
-           qr/CALL  sendsyslog\(.*LOG_CONS.*\)/ => 1,
+           qr/CALL  (\(via syscall\) )?sendsyslog\(.*LOG_CONS.*\)/ => 1,
            qr/GIO   fd -1 wrote \d+ bytes/ => 2,
            qr/RET   sendsyslog 0/ => 2,
        },

diff --git a/regress/usr.sbin/syslogd/args-sendsyslog-nostash.pl b/regress/usr.sbin/syslogd/args-sendsyslog-nostash.pl
index c02c10c..042fa69 100644 (file)
--- a/regress/usr.sbin/syslogd/args-sendsyslog-nostash.pl
+++ b/regress/usr.sbin/syslogd/args-sendsyslog-nostash.pl
@@ -35,7 +35,7 @@ our %args = (
                    or die ref($self), " syslogd started not in syslogd.log";
        })},
        ktrace => {
-           qr/CALL  sendsyslog\(/ => '>=103',
+           qr/CALL  (\(via syscall\) )?sendsyslog\(/ => '>=103',
            qr/RET   sendsyslog -1 errno $errno / => 102,
        },
        loggrep => {

diff --git a/regress/usr.sbin/syslogd/args-sendsyslog-syscall.pl b/regress/usr.sbin/syslogd/args-sendsyslog-syscall.pl
index 67e6988..0d72e5d 100644 (file)
--- a/regress/usr.sbin/syslogd/args-sendsyslog-syscall.pl
+++ b/regress/usr.sbin/syslogd/args-sendsyslog-syscall.pl
@@ -13,7 +13,7 @@ our %args = (
     client => {
        connect => { domain => "sendsyslog" },
        ktrace => {
-           qr/CALL  sendsyslog\(/ => 2,
+           qr/CALL  (\(via syscall\) )?sendsyslog\(/ => 2,
            qr/GIO   fd -1 wrote \d+ bytes/ => 2,
            qr/RET   sendsyslog 0/ => 2,
        },