Commit 6a289a5b authored by Philippe Mathieu-Daudé's avatar Philippe Mathieu-Daudé
Browse files

tests/acceptance/boot_linux: Expand SD card image to power of 2 



In few commits we won't allow SD card images with invalid size
(not aligned to a power of 2). Prepare the tests: add the
pow2ceil() and image_pow2ceil_expand() methods and resize the
images (expanding) of the tests using SD cards.

Signed-off-by: default avatarPhilippe Mathieu-Daudé <f4bug@amsat.org>
Reviewed-by: default avatarAlistair Francis <alistair.francis@wdc.com>
Reviewed-by: default avatarCleber Rosa <crosa@redhat.com>
Message-Id: <20200713183209.26308-5-f4bug@amsat.org>
parent b7dcbf13

tests/acceptance/boot_linux_console.py

+22 −9
Original line number Diff line number Diff line
@@ -28,6 +28,22 @@ try: 
except CmdNotFoundError:

    P7ZIP_AVAILABLE = False



"""

Round up to next power of 2

"""

def pow2ceil(x):

    return 1 if x == 0 else 2**(x - 1).bit_length()



"""

Expand file size to next power of 2

"""

def image_pow2ceil_expand(path):

        size = os.path.getsize(path)

        size_aligned = pow2ceil(size)

        if size != size_aligned:

            with open(path, 'ab+') as fd:

                fd.truncate(size_aligned)



class LinuxKernelTest(Test):

    KERNEL_COMMON_COMMAND_LINE = 'printk.time=0 '
@@ -636,6 +652,7 @@ class BootLinuxConsole(LinuxKernelTest): 
        rootfs_path_xz = self.fetch_asset(rootfs_url, asset_hash=rootfs_hash)

        rootfs_path = os.path.join(self.workdir, 'rootfs.cpio')

        archive.lzma_uncompress(rootfs_path_xz, rootfs_path)

        image_pow2ceil_expand(rootfs_path)



        self.vm.set_console()

        kernel_command_line = (self.KERNEL_COMMON_COMMAND_LINE +
@@ -673,7 +690,7 @@ class BootLinuxConsole(LinuxKernelTest): 
        :avocado: tags=device:sd

        """



        # This test download a 196MB compressed image and expand it to 932MB...

        # This test download a 196MB compressed image and expand it to 1GB

        image_url = ('https://dl.armbian.com/orangepipc/archive/'

                     'Armbian_19.11.3_Orangepipc_bionic_current_5.3.9.7z')

        image_hash = '196a8ffb72b0123d92cea4a070894813d305c71e'
@@ -681,6 +698,7 @@ class BootLinuxConsole(LinuxKernelTest): 
        image_name = 'Armbian_19.11.3_Orangepipc_bionic_current_5.3.9.img'

        image_path = os.path.join(self.workdir, image_name)

        process.run("7z e -o%s %s" % (self.workdir, image_path_7z))

        image_pow2ceil_expand(image_path)



        self.vm.set_console()

        self.vm.add_args('-drive', 'file=' + image_path + ',if=sd,format=raw',
@@ -714,7 +732,7 @@ class BootLinuxConsole(LinuxKernelTest): 
        :avocado: tags=machine:orangepi-pc

        :avocado: tags=device:sd

        """

        # This test download a 304MB compressed image and expand it to 1.3GB...

        # This test download a 304MB compressed image and expand it to 2GB

        deb_url = ('http://snapshot.debian.org/archive/debian/'

                   '20200108T145233Z/pool/main/u/u-boot/'

                   'u-boot-sunxi_2020.01%2Bdfsg-1_armhf.deb')
@@ -731,8 +749,9 @@ class BootLinuxConsole(LinuxKernelTest): 
        image_hash = '2babb29d36d8360adcb39c09e31060945259917a'

        image_path_gz = self.fetch_asset(image_url, asset_hash=image_hash)

        image_path = os.path.join(self.workdir, 'armv7.img')

        image_drive_args = 'if=sd,format=raw,snapshot=on,file=' + image_path

        archive.gzip_uncompress(image_path_gz, image_path)

        image_pow2ceil_expand(image_path)

        image_drive_args = 'if=sd,format=raw,snapshot=on,file=' + image_path



        # dd if=u-boot-sunxi-with-spl.bin of=armv7.img bs=1K seek=8 conv=notrunc

        with open(uboot_path, 'rb') as f_in:
@@ -740,12 +759,6 @@ class BootLinuxConsole(LinuxKernelTest): 
                f_out.seek(8 * 1024)

                shutil.copyfileobj(f_in, f_out)



                # Extend image, to avoid that NetBSD thinks the partition

                # inside the image is larger than device size itself

                f_out.seek(0, 2)

                f_out.seek(64 * 1024 * 1024, 1)

                f_out.write(bytearray([0x00]))



        self.vm.set_console()

        self.vm.add_args('-nic', 'user',

                         '-drive', image_drive_args,