From 41b535d312828eac6fd79481d04abe20163b0cc8 Mon Sep 17 00:00:00 2001 From: Adrian Reber Date: Tue, 16 Jun 2020 14:26:06 +0000 Subject: [PATCH] test: skip vdso test on non-vdso systems Signed-off-by: Adrian Reber --- scripts/travis/vagrant.sh | 3 +-- test/zdtm/static/vdso01.checkskip | 3 +++ 2 files changed, 4 insertions(+), 2 deletions(-) create mode 100755 test/zdtm/static/vdso01.checkskip diff --git a/scripts/travis/vagrant.sh b/scripts/travis/vagrant.sh index 943a8b9a3..46740efc3 100755 --- a/scripts/travis/vagrant.sh +++ b/scripts/travis/vagrant.sh @@ -45,9 +45,8 @@ fedora-no-vdso() { vagrant reload ssh default cat /proc/cmdline ssh default 'cd /vagrant; tar xf criu.tar; cd criu; make -j 4' - # Excluding the VDSO test as we are running without VDSO # Excluding two cgroup tests which seem to fail because of cgroup2 - ssh default 'cd /vagrant/criu/test; sudo ./zdtm.py run -a -x zdtm/static/cgroup04 -x zdtm/static/cgroup_ifpriomap -x zdtm/static/vdso01 --keep-going' + ssh default 'cd /vagrant/criu/test; sudo ./zdtm.py run -a -x zdtm/static/cgroup04 -x zdtm/static/cgroup_ifpriomap --keep-going' } $1 diff --git a/test/zdtm/static/vdso01.checkskip b/test/zdtm/static/vdso01.checkskip new file mode 100755 index 000000000..a00df6231 --- /dev/null +++ b/test/zdtm/static/vdso01.checkskip @@ -0,0 +1,3 @@ +#!/bin/bash + +grep -q "\[vdso\]" /proc/self/maps