From: Trevor Gamblin Date: Tue, 24 Sep 2024 11:55:02 +0000 (-0400) Subject: scripts/patchtest: split out result messages X-Git-Tag: yocto-5.2~1738 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=5553edc0f8d58dc6e3a4f703af9bdb04fda1e12f;p=thirdparty%2Fopenembedded%2Fopenembedded-core-contrib.git scripts/patchtest: split out result messages Add a minor refactor for the result output. Signed-off-by: Trevor Gamblin Signed-off-by: Richard Purdie --- diff --git a/scripts/patchtest b/scripts/patchtest index 278fc4e6e09..9218db232a7 100755 --- a/scripts/patchtest +++ b/scripts/patchtest @@ -165,16 +165,23 @@ def run(patch, logfile=None): postmerge_resultklass = getResult(patch, True, logfile) postmerge_result = _runner(postmerge_resultklass, 'test') - print('----------------------------------------------------------------------\n') - if premerge_result == 2 and postmerge_result == 2: - logger.error('patchtest: No test cases found - did you specify the correct suite directory?') - if premerge_result == 1 or postmerge_result == 1: - logger.error('WARNING: patchtest: At least one patchtest caused a failure or an error - please check https://wiki.yoctoproject.org/wiki/Patchtest for further guidance') - else: - logger.info('OK: patchtest: All patchtests passed') - print('----------------------------------------------------------------------\n') + print_result_message(premerge_result, postmerge_result) return premerge_result or postmerge_result +def print_result_message(preresult, postresult): + print("----------------------------------------------------------------------\n") + if preresult == 2 and postresult == 2: + logger.error( + "patchtest: No test cases found - did you specify the correct suite directory?" + ) + if preresult == 1 or postresult == 1: + logger.error( + "WARNING: patchtest: At least one patchtest caused a failure or an error - please check https://wiki.yoctoproject.org/wiki/Patchtest for further guidance" + ) + else: + logger.info("OK: patchtest: All patchtests passed") + print("----------------------------------------------------------------------\n") + def main(): tmp_patch = False patch_path = PatchtestParser.patch_path