diff options
author | Craig Small <csmall@dropbear.xyz> | 2022-03-22 20:20:53 +1100 |
---|---|---|
committer | Craig Small <csmall@dropbear.xyz> | 2022-03-22 20:20:53 +1100 |
commit | b98e5657ee1f85474fcd9a690e0bbc0c86279cda (patch) | |
tree | eaf419a51ea33a679ae233d5047ee89ff25f6208 /testsuite | |
parent | d557ad8a6e2c59c727b828008fbee7716cfead07 (diff) | |
download | procps-ng-b98e5657ee1f85474fcd9a690e0bbc0c86279cda.tar.gz |
testsuite: ps out tests more lenient
Sometimes due to race conditions or the way dejagnu gates the
output, or even there is another interesting process, the ps tests
sometimes fail. These changes make it a little more lenient without
losing the purpose of the test.
Replaces Debian patch ps_tests
References:
https://salsa.debian.org/debian/procps/-/blob/debian/2%253.3.17-7/debian/patches/ps_checks
Diffstat (limited to 'testsuite')
-rw-r--r-- | testsuite/ps.test/ps_output.exp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/testsuite/ps.test/ps_output.exp b/testsuite/ps.test/ps_output.exp index fef4556..99fa8d4 100644 --- a/testsuite/ps.test/ps_output.exp +++ b/testsuite/ps.test/ps_output.exp @@ -22,8 +22,8 @@ set ps_time "\(\d+-\)?\\\d{1,3}:\\d{2}\\s*" set ps_class "\[A-Z?-\]\\s*" set flag_match { - "%cpu,pcpu,%mem,pmem" "%CPU\\s+%CPU\\s+%MEM\\s+%MEM\\s+\(\\d+\.\\d+\\s*\){4}$" - "blocked,sig_block,sigmask,caught,sigcatch,sig_catch" "\(BLOCKED\\s+\){3}\(CAUGHT\\s+\){2}CATCHED\\s+\(<?\[0-9a-f\]+\\s*\){6}$" + "%cpu,pcpu,%mem,pmem" "%CPU\\s+%CPU\\s+%MEM\\s+%MEM\\s+\(\(\\d+\.\\d+\\s*\){4}\)+$" + "blocked,sig_block,sigmask,caught,sigcatch,sig_catch" "\(BLOCKED\\s+\){3}\(CAUGHT\\s+\){2}CATCHED\\s+\(<?\[0-9a-f\]+\\s*\)+$" "bsdstart,start,lstart" "\\s*START\\s+STARTED\\s+STARTED\\s+\(\\s*\(\[A-Z\]\[a-z\]{2} \\d+|\\d+:\\d{2}\)\\s+\(\[A-Z\]\[a-z\]{2} \\d+|\\d+:\\d{2}:\\d{2}\)\\s+\[A-Z\]\[a-z\]{2} \[A-Z\]\[a-z\]{2}\\s+\\d+ \\d{2}:\\d{2}:\\d{2} \\d{4}\\s*\)+$" "bsdtime,cputime,etime,etimes" "\\s*TIME\\s+TIME\\s+ELAPSED\\s+ELAPSED\\s*\(\\s*\\d+:\\d{2}\\s+\\d{2}:\\d{2}:\\d{2}\\s+\(\\d{2}:\)?\\d{2}:\\d{2}\\s+\\d+\\s*\)+$" "user,ruser,group,rgroup,uid,ruid,gid,rgid" "\\s*USER\\s+RUSER\\s+GROUP\\s+RGROUP\\s+UID\\s+RUID\\s+GID\\s+RGID\\s+\(\(\\s*\[A-Za-z0-9_+-\]+\\s+\){4}\(\\d+\\s+\){4}\\s*\)+$" |