Commit ffcf9c59 authored by Anas Nashif's avatar Anas Nashif Committed by Carles Cufi
Browse files

twister: do not add a platform to keyed tests if previously filtered 



If a platform is fitlered, do not add it to keyed test map, otherwise we
will end up skipping all platforms from the same class without any
coverage.

Signed-off-by: default avatarAnas Nashif <anas.nashif@intel.com>
parent 2aa7ef1d

scripts/pylib/twister/twisterlib/testplan.py

+15 −12
Original line number Diff line number Diff line
@@ -841,6 +841,17 @@ class TestPlan: 
                                instance.add_filter("Snippet not supported", Filters.PLATFORM)

                                break



                # handle quarantined tests

                if self.quarantine:

                    matched_quarantine = self.quarantine.get_matched_quarantine(

                        instance.testsuite.id, plat.name, plat.arch, plat.simulation

                    )

                    if matched_quarantine and not self.options.quarantine_verify:

                        instance.add_filter("Quarantine: " + matched_quarantine, Filters.QUARENTINE)

                    if not matched_quarantine and self.options.quarantine_verify:

                        instance.add_filter("Not under quarantine", Filters.QUARENTINE)





                # platform_key is a list of unique platform attributes that form a unique key a test

                # will match against to determine if it should be scheduled to run. A key containing a

                # field name that the platform does not have will filter the platform.
@@ -862,22 +873,14 @@ class TestPlan: 
                        keyed_test = keyed_tests.get(test_key)

                        if keyed_test is not None:

                            plat_key = {key_field: getattr(keyed_test['plat'], key_field) for key_field in key_fields}

                            instance.add_filter(f"Excluded test already covered for key {tuple(key)} by platform {keyed_test['plat'].name} having key {plat_key}", Filters.PLATFORM_KEY)

                            instance.add_filter(f"Already covered for key {tuple(key)} by platform {keyed_test['plat'].name} having key {plat_key}", Filters.PLATFORM_KEY)

                        else:

                            # do not add a platform to keyed tests if previously filtered

                            if not instance.filters:

                                keyed_tests[test_key] = {'plat': plat, 'ts': ts}

                    else:

                        instance.add_filter(f"Excluded platform missing key fields demanded by test {key_fields}", Filters.PLATFORM)



                # handle quarantined tests

                if self.quarantine:

                    matched_quarantine = self.quarantine.get_matched_quarantine(

                        instance.testsuite.id, plat.name, plat.arch, plat.simulation

                    )

                    if matched_quarantine and not self.options.quarantine_verify:

                        instance.add_filter("Quarantine: " + matched_quarantine, Filters.QUARENTINE)

                    if not matched_quarantine and self.options.quarantine_verify:

                        instance.add_filter("Not under quarantine", Filters.QUARENTINE)



                # if nothing stopped us until now, it means this configuration

                # needs to be added.

                instance_list.append(instance)

CRA Git | Maintained and supported by SUSTech CRA and CCSE