mir/criu
2
0
Fork 0
mirror of https://github.com/checkpoint-restore/criu synced 2025-08-30 05:48:05 +00:00
Code Issues Releases Wiki Activity

zdtm.py: exclude a vsyscall vma for x32 tests

Browse Source 
We alwasy exclude vsyscall vma-s for x32 tests, but
this part was broken by python3 patches.

1: Old maps lost: set([])
1: New maps appeared: set([u"ffffffffff600000-ffffffffff601000 [u'r-xp']"])

Reported-by: Mr Jenkins
Signed-off-by: Andrei Vagin <avagin@virtuozzo.com>
This commit is contained in:
Andrei Vagin 2018-06-17 06:25:03 +03:00 committed by Pavel Emelyanov
parent e2143aff72
commit 8a5321d99c
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
test/zdtm.py
View File

@ -1236,7 +1236,7 @@ def get_visible_state(test):
cmaps.append(m)
last += 1
maps[pid] = set(map(lambda x: '%x-%x %s' % (x[0], x[1], x[2:]), cmaps))
maps[pid] = set(map(lambda x: '%x-%x %s' % (x[0], x[1], " ".join(x[2:])), cmaps))
cmounts = []
try:
@ -1265,7 +1265,7 @@ def check_visible_state(test, state, opts):
new_maps = new[1][pid]
if os.getenv("COMPAT_TEST"):
# the vsyscall vma isn't unmapped from x32 processes
vsyscall = "ffffffffff600000-ffffffffff601000 ['r-xp']"
vsyscall = u"ffffffffff600000-ffffffffff601000 r-xp"
if vsyscall in new_maps and vsyscall not in old_maps:
new_maps.remove(vsyscall)
if old_maps != new_maps: