Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/checkpoint-restore/criu.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexander Mikhalitsyn <alexander.mikhalitsyn@virtuozzo.com>2022-05-05 15:33:50 +0300
committerAndrei Vagin <avagin@gmail.com>2022-05-05 22:42:14 +0300
commit17a19676cdf803ec985aede9f38b8deaa971ac98 (patch)
tree5c427e89159088977650d418a7cc1ea4b1ab7e57
parentc1380c077aa60d5e3fe8de42cb7329a16e0ac5ae (diff)
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>
-rwxr-xr-xtest/zdtm.py18
-rwxr-xr-xtest/zdtm/static/maps09.checkskip4
l---------test/zdtm/static/maps10.checkskip1
3 files changed, 17 insertions, 6 deletions
diff --git a/test/zdtm.py b/test/zdtm.py
index 878c3e9cb..c011c79c0 100755
--- a/test/zdtm.py
+++ b/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():
diff --git a/test/zdtm/static/maps09.checkskip b/test/zdtm/static/maps09.checkskip
new file mode 100755
index 000000000..df2370815
--- /dev/null
+++ b/test/zdtm/static/maps09.checkskip
@@ -0,0 +1,4 @@
+#!/bin/bash
+
+# will fail with EOPNOTSUPP
+cat /proc/sys/vm/nr_hugepages &> /dev/null
diff --git a/test/zdtm/static/maps10.checkskip b/test/zdtm/static/maps10.checkskip
new file mode 120000
index 000000000..fb42f0f44
--- /dev/null
+++ b/test/zdtm/static/maps10.checkskip
@@ -0,0 +1 @@
+maps09.checkskip \ No newline at end of file