diff options
| -rw-r--r-- | meta/lib/oeqa/selftest/case.py | 6 | ||||
| -rw-r--r-- | meta/lib/oeqa/selftest/cases/sstatetests.py | 4 | ||||
| -rw-r--r-- | meta/lib/oeqa/selftest/context.py | 4 |
3 files changed, 6 insertions, 8 deletions
diff --git a/meta/lib/oeqa/selftest/case.py b/meta/lib/oeqa/selftest/case.py index 31a11fddda9..bfb59bba632 100644 --- a/meta/lib/oeqa/selftest/case.py +++ b/meta/lib/oeqa/selftest/case.py @@ -138,6 +138,12 @@ to ensure accurate results.") machine_conf = 'MACHINE ??= "%s"\n' % self.tc.custommachine self.set_machine_config(machine_conf) + # If buildhistory is enabled, we need to disable version-going-backwards + # QA checks for this test. It may report errors otherwise. + if "buildhistory.bbclass" in self.tc.td["BBINCLUDED"]: + self.logger.warn("You have buildhistory enabled, disabling 'version-going-backwards' QA checks") + self.append_config('ERROR_QA_remove = "version-going-backwards"') + # tests might need their own setup # but if they overwrite this one they have to call # super each time, so let's give them an alternative diff --git a/meta/lib/oeqa/selftest/cases/sstatetests.py b/meta/lib/oeqa/selftest/cases/sstatetests.py index 8d05e304239..375e92dbd14 100644 --- a/meta/lib/oeqa/selftest/cases/sstatetests.py +++ b/meta/lib/oeqa/selftest/cases/sstatetests.py @@ -138,10 +138,6 @@ class SStateTests(SStateBase): self.assertTrue(len(global_config) == len(target_config), msg='Lists global_config and target_config should have the same number of elements') self.config_sstate(temp_sstate_location=True, add_local_mirrors=[self.sstate_path]) - # If buildhistory is enabled, we need to disable version-going-backwards - # QA checks for this test. It may report errors otherwise. - self.append_config('ERROR_QA_remove = "version-going-backwards"') - # For not this only checks if random sstate tasks are handled correctly as a group. # In the future we should add control over what tasks we check for. diff --git a/meta/lib/oeqa/selftest/context.py b/meta/lib/oeqa/selftest/context.py index ca73070c0b7..0296a9263fd 100644 --- a/meta/lib/oeqa/selftest/context.py +++ b/meta/lib/oeqa/selftest/context.py @@ -150,10 +150,6 @@ class OESelftestTestContextExecutor(OETestContextExecutor): _check_required_env_variables(["BUILDDIR"]) _check_presence_meta_selftest() - if "buildhistory.bbclass" in self.tc.td["BBINCLUDED"]: - self.tc.logger.error("You have buildhistory enabled already and this isn't recommended for selftest, please disable it first.") - raise OEQAPreRun - if "PRSERV_HOST" in self.tc.td: self.tc.logger.error("Please unset PRSERV_HOST in order to run oe-selftest") raise OEQAPreRun |