| Message ID | 1547805767-24863-1-git-send-email-lizhijian@cn.fujitsu.com |
|---|---|
| State | New |
| Headers | show |
| Series | [1/2] Acceptance tests: use linux-3.6 and set vm memory to 4GiB | expand |
Sorry, there are some typos, please ignore this version i will correct in V2 On 1/18/19 18:02, Li Zhijian wrote: > linux-3.6 kernel shipped by Fedora-19 cannot support xldflags so that it s/Fedora-19/Fedora-18 > cannot support loading more than 2GiB initrd > > CC: Wainer dos Santos Moschetta <wainersm@redhat.com> > CC: Caio Carrara <ccarrara@redhat.com> > CC: Cleber Rosa <crosa@redhat.com> > CC: Eduardo Habkost <ehabkost@redhat.com> > CC: Philippe Mathieu-Daudé <philmd@redhat.com> > Signed-off-by: Li Zhijian <lizhijian@cn.fujitsu.com> > > --- > this patch is basing on early Acceptance tests: > https://patchwork.kernel.org/patch/10676415/ > --- > tests/acceptance/linux_initrd.py | 14 ++++++++------ > 1 file changed, 8 insertions(+), 6 deletions(-) > > diff --git a/tests/acceptance/linux_initrd.py b/tests/acceptance/linux_initrd.py > index 737355c..aeb9fde 100644 > --- a/tests/acceptance/linux_initrd.py > +++ b/tests/acceptance/linux_initrd.py > @@ -24,14 +24,16 @@ class LinuxInitrd(Test): > > timeout = 60 > > - def test_with_2gib_file_should_exit_error_msg(self): > + def test_with_2gib_file_should_exit_error_msg_with_linux_v3_6(self): > """ > Pretends to boot QEMU with an initrd file with size of 2GiB > and expect it exits with error message. > + Fedora-19 shipped with linux-3.6 which have not supported xloadflags Ditto Thanks > + cannot support more than 2GiB initrd. > """ > - kernel_url = ('https://mirrors.kernel.org/fedora/releases/28/' > - 'Everything/x86_64/os/images/pxeboot/vmlinuz') > - kernel_hash = '238e083e114c48200f80d889f7e32eeb2793e02a' > + kernel_url = ('https://archives.fedoraproject.org/pub/archive/fedora/li' > + 'nux/releases/18/Fedora/x86_64/os/images/pxeboot/vmlinuz') > + kernel_hash = '41464f68efe42b9991250bed86c7081d2ccdbb21' > kernel_path = self.fetch_asset(kernel_url, asset_hash=kernel_hash) > max_size = 2 * (1024 ** 3) - 1 > > @@ -39,8 +41,8 @@ class LinuxInitrd(Test): > initrd.seek(max_size) > initrd.write(b'\0') > initrd.flush() > - cmd = "%s -kernel %s -initrd %s" % (self.qemu_bin, kernel_path, > - initrd.name) > + cmd = "%s -kernel %s -initrd %s -m 4096" % ( > + self.qemu_bin, kernel_path, initrd.name) > res = run(cmd, ignore_status=True) > self.assertEqual(res.exit_status, 1) > expected_msg = r'.*initrd is too large.*max: \d+, need %s.*' % (
diff --git a/tests/acceptance/linux_initrd.py b/tests/acceptance/linux_initrd.py index 737355c..aeb9fde 100644 --- a/tests/acceptance/linux_initrd.py +++ b/tests/acceptance/linux_initrd.py @@ -24,14 +24,16 @@ class LinuxInitrd(Test): timeout = 60 - def test_with_2gib_file_should_exit_error_msg(self): + def test_with_2gib_file_should_exit_error_msg_with_linux_v3_6(self): """ Pretends to boot QEMU with an initrd file with size of 2GiB and expect it exits with error message. + Fedora-19 shipped with linux-3.6 which have not supported xloadflags + cannot support more than 2GiB initrd. """ - kernel_url = ('https://mirrors.kernel.org/fedora/releases/28/' - 'Everything/x86_64/os/images/pxeboot/vmlinuz') - kernel_hash = '238e083e114c48200f80d889f7e32eeb2793e02a' + kernel_url = ('https://archives.fedoraproject.org/pub/archive/fedora/li' + 'nux/releases/18/Fedora/x86_64/os/images/pxeboot/vmlinuz') + kernel_hash = '41464f68efe42b9991250bed86c7081d2ccdbb21' kernel_path = self.fetch_asset(kernel_url, asset_hash=kernel_hash) max_size = 2 * (1024 ** 3) - 1 @@ -39,8 +41,8 @@ class LinuxInitrd(Test): initrd.seek(max_size) initrd.write(b'\0') initrd.flush() - cmd = "%s -kernel %s -initrd %s" % (self.qemu_bin, kernel_path, - initrd.name) + cmd = "%s -kernel %s -initrd %s -m 4096" % ( + self.qemu_bin, kernel_path, initrd.name) res = run(cmd, ignore_status=True) self.assertEqual(res.exit_status, 1) expected_msg = r'.*initrd is too large.*max: \d+, need %s.*' % (
linux-3.6 kernel shipped by Fedora-19 cannot support xldflags so that it cannot support loading more than 2GiB initrd CC: Wainer dos Santos Moschetta <wainersm@redhat.com> CC: Caio Carrara <ccarrara@redhat.com> CC: Cleber Rosa <crosa@redhat.com> CC: Eduardo Habkost <ehabkost@redhat.com> CC: Philippe Mathieu-Daudé <philmd@redhat.com> Signed-off-by: Li Zhijian <lizhijian@cn.fujitsu.com> --- this patch is basing on early Acceptance tests: https://patchwork.kernel.org/patch/10676415/ --- tests/acceptance/linux_initrd.py | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-)