diff options
| author | Craig Small <csmall@dropbear.xyz> | 2022-05-03 19:37:39 +1000 |
|---|---|---|
| committer | Craig Small <csmall@dropbear.xyz> | 2022-05-03 19:37:39 +1000 |
| commit | 38693960a1aeaede5b789055bcac991c8c214610 (patch) | |
| tree | 6a609811aaed417fc3218b180b3477b035068c86 /testsuite | |
| parent | d66c1f39b52d53ec279fc638aa4a6352d7672201 (diff) | |
| download | procps-ng-38693960a1aeaede5b789055bcac991c8c214610.tar.gz | |
testsuite shmid can be hex too
Previously the match for shmid was \d+ but the variable is printed
as a hex number, updated the regex to suit.
Added some changes for pmap test so if the test_shm process fails
we just skip past it.
Signed-off-by: Craig Small <csmall@dropbear.xyz>
Diffstat (limited to 'testsuite')
| -rw-r--r-- | testsuite/config/unix.exp | 4 | ||||
| -rw-r--r-- | testsuite/pmap.test/pmap.exp | 8 |
2 files changed, 8 insertions, 4 deletions
diff --git a/testsuite/config/unix.exp b/testsuite/config/unix.exp index a43dbae..2590f95 100644 --- a/testsuite/config/unix.exp +++ b/testsuite/config/unix.exp @@ -195,8 +195,8 @@ proc make_testshm_proc { } { set testshmproc_spawnid $spawn_id expect { -i $testshmproc_spawnid - -re "^SHMID: (\\d+)" { set shmid $expect_out(1,string) } - default { fail "spawning testshm" } + -re "^SHMID: (\[0-9a-f\]+)" { set shmid $expect_out(1,string) } + default { set shmid "" } } } diff --git a/testsuite/pmap.test/pmap.exp b/testsuite/pmap.test/pmap.exp index 3b7e50e..1622cea 100644 --- a/testsuite/pmap.test/pmap.exp +++ b/testsuite/pmap.test/pmap.exp @@ -68,6 +68,10 @@ expect_pass $test "$pmap_initname\$" set test "pmap finding shm" make_testshm_proc -spawn $pmap $testshmproc_pid -expect_pass $test "\[ shmid=0x$shmid \]" +if { $shmid == "" } { + unsupported "$test - could not start test_shm" +} else { + spawn $pmap $testshmproc_pid + expect_pass $test "\[ shmid=0x$shmid \]" +} kill_testshm_proc |