Commit 6ef4db88 authored by Lukasz Mrugala's avatar Lukasz Mrugala Committed by Benjamin Cabé
Browse files

twister: Remove unrecognised sections test 

The section lists that govern whether the ELF
section is recognised or not are out of date.

A programming bug has rendered the unrecognised
section check unrunnable for years.

Thus, the practically dead code of the
unrecognised section check is removed
in this commit.

Signed-off-by: default avatarLukasz Mrugala <lukaszx.mrugala@intel.com>
parent 961593d1

scripts/pylib/twister/twisterlib/environment.py

+0 −6
Changes for scripts/pylib/twister/twisterlib/environment.py: 0 added lines, 6 removed lines.
Original line number Diff line number Diff line
@@ -482,12 +482,6 @@ structure in the main Zephyr tree: boards/<vendor>/<board_name>/""") 
        action="store_true",

        help="Collect and report ROM/RAM section sizes for each test image built.")



    parser.add_argument(

        "--disable-unrecognized-section-test",

        action="store_true",

        default=False,

        help="Don't error on unrecognized sections in the binary images.")



    footprint_group.add_argument(

        "--footprint-from-buildlog",

        action = "store_true",

scripts/pylib/twister/twisterlib/reports.py

+1 −8
Changes for scripts/pylib/twister/twisterlib/reports.py: 1 added line, 8 removed lines.
Original line number Diff line number Diff line
@@ -632,19 +632,12 @@ class Reporting: 
            )

            logger.info("-+" * 40)



    def summary(self, results, ignore_unrecognized_sections, duration):

    def summary(self, results, duration):

        failed = 0

        run = 0

        for instance in self.instances.values():

            if instance.status == TwisterStatus.FAIL:

                failed += 1

            elif not ignore_unrecognized_sections and instance.metrics.get("unrecognized"):

                logger.error(

                    f"{Fore.RED}FAILED{Fore.RESET}:"

                    f" {instance.name} has unrecognized binary sections:"

                    f" {instance.metrics.get('unrecognized', [])!s}"

                )

                failed += 1



            # FIXME: need a better way to identify executed tests

            handler_time = instance.metrics.get('handler_time', 0)

scripts/pylib/twister/twisterlib/runner.py

+0 −4
Changes for scripts/pylib/twister/twisterlib/runner.py: 0 added lines, 4 removed lines.
Original line number Diff line number Diff line
@@ -1793,7 +1793,6 @@ class ProjectBuilder(FilterBuilder): 
            instance.metrics["used_rom"] = 0

            instance.metrics["available_rom"] = 0

            instance.metrics["available_ram"] = 0

            instance.metrics["unrecognized"] = []

        return build_result



    @staticmethod
@@ -1809,13 +1808,11 @@ class ProjectBuilder(FilterBuilder): 
                instance.metrics["used_rom"] = size_calc.get_used_rom()

                instance.metrics["available_rom"] = size_calc.get_available_rom()

                instance.metrics["available_ram"] = size_calc.get_available_ram()

                instance.metrics["unrecognized"] = size_calc.unrecognized_sections()

            else:

                instance.metrics["used_ram"] = 0

                instance.metrics["used_rom"] = 0

                instance.metrics["available_rom"] = 0

                instance.metrics["available_ram"] = 0

                instance.metrics["unrecognized"] = []

            instance.metrics["handler_time"] = instance.execution_time



class TwisterRunner:
@@ -1891,7 +1888,6 @@ class TwisterRunner: 
                else:

                    inst.metrics.update(self.instances[inst.name].metrics)

                    inst.metrics["handler_time"] = inst.execution_time

                    inst.metrics["unrecognized"] = []

                    self.instances[inst.name] = inst



            print("")

scripts/pylib/twister/twisterlib/size_calc.py

+1 −17
Changes for scripts/pylib/twister/twisterlib/size_calc.py: 1 added line, 17 removed lines.
Original line number Diff line number Diff line
@@ -154,17 +154,6 @@ class SizeCalculator: 
        """

        return self.used_rom



    def unrecognized_sections(self):

        """Get a list of sections inside the binary that weren't recognized



        @return list of unrecognized section names

        """

        slist = []

        for v in self.sections:

            if not v["recognized"]:

                slist.append(v["name"])

        return slist



    def get_available_ram(self) -> int:

        """Get the total available RAM.
@@ -251,7 +240,6 @@ class SizeCalculator: 


            # Add section to memory use totals (for both non-XIP and XIP scenarios)

            # Unrecognized section names are not included in the calculations.

            recognized = True



            # If build.log file exists, check errors (unrecognized sections

            # in ELF file).
@@ -262,8 +250,6 @@ class SizeCalculator: 
                    continue

                else:

                    stype = "unknown"

                    if name not in self.extra_sections:

                        recognized = False

            else:

                if name in SizeCalculator.alloc_sections:

                    self.used_ram += size
@@ -279,12 +265,10 @@ class SizeCalculator: 
                    stype = "ro"

                else:

                    stype = "unknown"

                    if name not in self.extra_sections:

                        recognized = False



            self.sections.append({"name": name, "load_addr": load_addr,

                                  "size": size, "virt_addr": virt_addr,

                                  "type": stype, "recognized": recognized})

                                  "type": stype})



    def _analyze_elf_file(self) -> None:

        self._check_elf_file()

scripts/pylib/twister/twisterlib/twister_main.py

+1 −1
Changes for scripts/pylib/twister/twisterlib/twister_main.py: 1 added line, 1 removed line.
Original line number Diff line number Diff line
@@ -181,7 +181,7 @@ def twister(options: argparse.Namespace, default_options: argparse.Namespace): 
    if options.verbose > 1:

        runner.results.summary()



    report.summary(runner.results, options.disable_unrecognized_section_test, duration)

    report.summary(runner.results, duration)



    report.coverage_status = True

    if options.coverage and not options.disable_coverage_aggregation:

CRA Git | Maintained and supported by SUSTech CRA and CCSE