From b6679b9c7c774096c145713c4a9d70d4b4d315ad Mon Sep 17 00:00:00 2001 From: ngie Date: Mon, 22 Apr 2019 03:19:40 +0000 Subject: [PATCH] Comment out checks that are causing failures on ^/stable/11, post-r337133 Some usr.bin/procstat code has not been MFCed to ^/stable/11 for command line handling, and unfortunately, r337133 (which was MFCed as r337542) relies on that support. Comment out the checks and add a pointer to the PR for code archaeology and to cause future potential parties to verify changes when backporting them. This is a direct commit to ^/stable/11 PR: 237445 Reviewed by: markj Approved by: emaste (mentor; implicit) Differential Revision: https://reviews.freebsd.org/D19998 --- usr.bin/procstat/tests/procstat_test.sh | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/usr.bin/procstat/tests/procstat_test.sh b/usr.bin/procstat/tests/procstat_test.sh index baec7c42b75..2307739ce45 100755 --- a/usr.bin/procstat/tests/procstat_test.sh +++ b/usr.bin/procstat/tests/procstat_test.sh @@ -138,8 +138,9 @@ kernel_stacks_head() } kernel_stacks_body() { - atf_check -o save:procstat.out procstat -a kstack - atf_check -o not-empty awk '{if ($3 == "procstat") print}' procstat.out + # Bug 237445: checks will fail because of missing MFCs on branch + #atf_check -o save:procstat.out procstat -a kstack + #atf_check -o not-empty awk '{if ($3 == "procstat") print}' procstat.out atf_check -o save:procstat.out procstat -kka atf_check -o not-empty awk '{if ($3 == "procstat") print}' procstat.out -- 2.45.0