mirror of
https://github.com/checkpoint-restore/criu.git
synced 2026-07-17 16:47:50 +00:00
zdtm: handle the case when hugetlb isn't supported
Fixes: e2e02bc83e ("zdtm: Add MAP_HUGETLB memory mapping test")
Signed-off-by: Alexander Mikhalitsyn <alexander.mikhalitsyn@virtuozzo.com>
This commit is contained in:
parent
c1380c077a
commit
17a19676cd
3 changed files with 17 additions and 6 deletions
18
test/zdtm.py
18
test/zdtm.py
|
|
@ -2584,12 +2584,18 @@ def clean_stuff(opts):
|
|||
|
||||
|
||||
def set_nr_hugepages(nr):
|
||||
orig_hugepages = 0
|
||||
with open("/proc/sys/vm/nr_hugepages", "r") as f:
|
||||
orig_hugepages = int(f.read())
|
||||
with open("/proc/sys/vm/nr_hugepages", "w") as f:
|
||||
f.write("{}\n".format(nr))
|
||||
return orig_hugepages
|
||||
try:
|
||||
orig_hugepages = 0
|
||||
with open("/proc/sys/vm/nr_hugepages", "r") as f:
|
||||
orig_hugepages = int(f.read())
|
||||
with open("/proc/sys/vm/nr_hugepages", "w") as f:
|
||||
f.write("{}\n".format(nr))
|
||||
return orig_hugepages
|
||||
except OSError as err:
|
||||
if err.errno != errno.EOPNOTSUPP:
|
||||
raise
|
||||
|
||||
return 0
|
||||
|
||||
|
||||
def get_cli_args():
|
||||
|
|
|
|||
4
test/zdtm/static/maps09.checkskip
Executable file
4
test/zdtm/static/maps09.checkskip
Executable file
|
|
@ -0,0 +1,4 @@
|
|||
#!/bin/bash
|
||||
|
||||
# will fail with EOPNOTSUPP
|
||||
cat /proc/sys/vm/nr_hugepages &> /dev/null
|
||||
1
test/zdtm/static/maps10.checkskip
Symbolic link
1
test/zdtm/static/maps10.checkskip
Symbolic link
|
|
@ -0,0 +1 @@
|
|||
maps09.checkskip
|
||||
Loading…
Add table
Add a link
Reference in a new issue