summaryrefslogtreecommitdiff
path: root/testsuite
diff options
context:
space:
mode:
authorPierre Labastie <pierre.labastie@neuf.fr>2013-04-07 18:31:26 +1000
committerCraig Small <csmall@enc.com.au>2013-04-07 18:31:26 +1000
commit1b63eb86710965d6fdb9f3db5afc34530868323b (patch)
tree816e8fa29ce35ff065dce05cf3e259bd586de733 /testsuite
parent7888f6a679e35e9a864a95575b1a8f14d8f0ec8d (diff)
downloadprocps-ng-1b63eb86710965d6fdb9f3db5afc34530868323b.tar.gz
Improved regexp test for pmap
The change in pmap is necessary if it happens that the whole output of pmap -X or -XX has been done before the second regexp is matched. Since the matching is greedy, it is matched by the full output, so that nothing is left for the third regexp and the test fails with FAIL: extra extended output (footer). Reference: http://comments.gmane.org/gmane.linux.lfs.devel/13961 Signed-off-by: Craig Small <csmall@enc.com.au>
Diffstat (limited to 'testsuite')
-rw-r--r--testsuite/pmap.test/pmap.exp4
1 files changed, 2 insertions, 2 deletions
diff --git a/testsuite/pmap.test/pmap.exp b/testsuite/pmap.test/pmap.exp
index ffbdb4f..bc2550a 100644
--- a/testsuite/pmap.test/pmap.exp
+++ b/testsuite/pmap.test/pmap.exp
@@ -52,11 +52,11 @@ expect_table $test $pmap_ext_header $pmap_ext_items $pmap_ext_footer
# -X and -XX have no real format as its dependent on smaps
set test "pmap extra extended output"
spawn $pmap -X $mypid
-expect_table $test $pmap_generic_header ".+" "\[= \]+"
+expect_table $test $pmap_generic_header "\[^=\]+" "\[= \]+"
set test "pmap double extra extended output"
spawn $pmap -XX $mypid
-expect_table $test $pmap_generic_header ".+" "\[= \]+"
+expect_table $test $pmap_generic_header "\[^=\]+" "\[= \]+"
set test "pmap X with unreachable process"
spawn $pmap -X 1