summaryrefslogtreecommitdiffstats
path: root/tests/acceptance
diff options
context:
space:
mode:
authorAlex Bennée2020-07-01 15:56:41 +0200
committerAlex Bennée2020-07-11 16:53:00 +0200
commit3c1de3af46e43be709294f8f67c2b979f71b1657 (patch)
tree2b258214b0f26929c5d68d774b467a5a59abeb08 /tests/acceptance
parenttests/acceptance: skip multicore mips_malta tests on GitLab (diff)
downloadqemu-3c1de3af46e43be709294f8f67c2b979f71b1657.tar.gz
qemu-3c1de3af46e43be709294f8f67c2b979f71b1657.tar.xz
qemu-3c1de3af46e43be709294f8f67c2b979f71b1657.zip
tests/acceptance: skip LinuxInitrd 2gib with v4.16 on GitLab
This fails on GitLab but not when run locally on the same container image. It's very confusing. Signed-off-by: Alex Bennée <alex.bennee@linaro.org> Acked-by: Philippe Mathieu-Daudé <f4bug@amsat.org> Message-Id: <20200701135652.1366-30-alex.bennee@linaro.org>
Diffstat (limited to 'tests/acceptance')
-rw-r--r--tests/acceptance/linux_initrd.py3
1 files changed, 3 insertions, 0 deletions
diff --git a/tests/acceptance/linux_initrd.py b/tests/acceptance/linux_initrd.py
index a3e54d3fc9..a249e2f14a 100644
--- a/tests/acceptance/linux_initrd.py
+++ b/tests/acceptance/linux_initrd.py
@@ -8,10 +8,12 @@
# This work is licensed under the terms of the GNU GPL, version 2 or
# later. See the COPYING file in the top-level directory.
+import os
import logging
import tempfile
from avocado_qemu import Test
+from avocado import skipIf
class LinuxInitrd(Test):
@@ -51,6 +53,7 @@ class LinuxInitrd(Test):
max_size + 1)
self.assertRegex(self.vm.get_log(), expected_msg)
+ @skipIf(os.getenv('GITLAB_CI'), 'Running on GitLab')
def test_with_2gib_file_should_work_with_linux_v4_16(self):
"""
QEMU has supported up to 4 GiB initrd for recent kernel