diff options
| author | Gilles Espinasse <g.esp@free.fr> | 2012-05-07 09:12:06 +0200 |
|---|---|---|
| committer | Craig Small <csmall@enc.com.au> | 2012-05-08 22:51:19 +1000 |
| commit | e6bc6297564c953edfe7c342da8a6e5ca9436156 (patch) | |
| tree | ff428a928f2be7dc0ad7721c7ee3e98902e249d5 /testsuite | |
| parent | 847bf4c0c184d0cd920ff31869a4cfb148cf967a (diff) | |
| download | procps-ng-e6bc6297564c953edfe7c342da8a6e5ca9436156.tar.gz | |
Fix w tests when no user is logged in
When the build system is a chroot with no user logged in , all w tests fail because of {1,} match rule for the userline
Allow 0 match replacing {1,} with *
Signed-off-by: Gilles Espinasse <g.esp@free.fr>
Diffstat (limited to 'testsuite')
| -rw-r--r-- | testsuite/w.test/w.exp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/testsuite/w.test/w.exp b/testsuite/w.test/w.exp index 30ab22c..8fd744b 100644 --- a/testsuite/w.test/w.exp +++ b/testsuite/w.test/w.exp @@ -17,10 +17,10 @@ set w_login "\(\\d+\[A-Z\]\[a-z\]{2}\\d+\|\[A-Z\]\[a-z\]{2}\\d+\|\\d+:\\d+\)" set w_idle "\(\\?xdm\\?\|\\?\|\\d+days\|\\d+:\\d+m?\|\\d+.\\d+s\)" set w_ival7 "\(\\?\|\\d+days\|\\d+:\\d+m?\|\\d+.\\d+s\)" set w_what "\[A-Za-z0-9_\/\\-\]+" -set w_std_userlines "\(${w_user}\\s+${w_tty}\\s+${w_login}\\s+${w_idle}\\s+${w_ival7}\\s+${w_ival7}\\s+${w_what}\\s*\){1,}" -set w_short_userlines "\(${w_user}\\s+${w_tty}\\s+${w_idle}\\s+${w_what}\\s*\){1,}" -set w_from_userlines "\(${w_user}\\s+${w_tty}\\s+${w_from}\\s+${w_login}\\s+${w_idle}\\s+${w_ival7}\\s+${w_ival7}\\s+${w_what}\\s*\){1,}" -set w_fromshort_userlines "\(${w_user}\\s+${w_tty}\\s+${w_from}\\s+${w_idle}\\s+${w_what}\\s*\){1,}" +set w_std_userlines "\(${w_user}\\s+${w_tty}\\s+${w_login}\\s+${w_idle}\\s+${w_ival7}\\s+${w_ival7}\\s+${w_what}\\s*\)*" +set w_short_userlines "\(${w_user}\\s+${w_tty}\\s+${w_idle}\\s+${w_what}\\s*\)*" +set w_from_userlines "\(${w_user}\\s+${w_tty}\\s+${w_from}\\s+${w_login}\\s+${w_idle}\\s+${w_ival7}\\s+${w_ival7}\\s+${w_what}\\s*\)*" +set w_fromshort_userlines "\(${w_user}\\s+${w_tty}\\s+${w_from}\\s+${w_idle}\\s+${w_what}\\s*\)*" set test "w with no arguments" spawn $w |