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>
This commit is contained in:
Craig Small
2022-05-03 19:37:39 +10:00
parent d66c1f39b5
commit 38693960a1
2 changed files with 8 additions and 4 deletions

View File

@@ -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 "" }
}
}