@@ -640,10 +640,9 @@ def log_sketch_build_result(sketch, boardKo, boardSkipped):
640640# Log final result
641641def log_final_result ():
642642 # Also equal to len(board_fqbn) * len(sketch_list)
643- nb_build_total = nb_build_passed + nb_build_failed + nb_build_skipped
643+ nb_build_total = nb_build_passed + nb_build_failed
644644 stat_passed = round (nb_build_passed * 100.0 / nb_build_total , 2 )
645645 stat_failed = round (nb_build_failed * 100.0 / nb_build_total , 2 )
646- stat_skipped = round (nb_build_skipped * 100.0 / nb_build_total , 2 )
647646 duration = str (timedelta (seconds = time .time () - full_buildTime ))
648647
649648 # Log file
@@ -653,8 +652,8 @@ def log_final_result():
653652 f .write (build_separator + "\n " )
654653 ssucc = f"{ nb_build_passed } succeeded ({ stat_passed } %)"
655654 sfail = f"{ nb_build_failed } failed ({ stat_failed } %)"
656- sskip = f"{ nb_build_skipped } skipped ( { stat_skipped } % )"
657- f .write (f"{ ssucc } , { sfail } , { sskip } of { nb_build_total } builds\n " )
655+ sskip = f"{ nb_build_skipped } skipped)"
656+ f .write (f"{ ssucc } , { sfail } of { nb_build_total } builds ( { sskip } ) \n " )
658657 f .write (f"Ends { time .strftime ('%A %d %B %Y %H:%M:%S' )} \n " )
659658 f .write (f"Duration: { duration } \n " )
660659 f .write (f"Logs are available here:\n { output_dir } \n " )
@@ -663,8 +662,8 @@ def log_final_result():
663662 # Standard output
664663 ssucc = f"{ nb_build_passed } { fsucc } ({ stat_passed } %)"
665664 sfail = f"{ nb_build_failed } { ffail } ({ stat_failed } %)"
666- sskip = f"{ nb_build_skipped } { fskip } ( { stat_skipped } %) "
667- print (f"Builds Summary: { ssucc } , { sfail } , { sskip } of { nb_build_total } builds" )
665+ sskip = f"{ nb_build_skipped } { fskip } "
666+ print (f"Builds Summary: { ssucc } , { sfail } of { nb_build_total } builds ( { sskip } ) " )
668667 print (f"Duration: { duration } " )
669668 print ("Logs are available here:" )
670669 print (output_dir )
@@ -676,7 +675,7 @@ def get_fqbn(b_name):
676675 return board_custom_fqbn [b_name ]
677676 else :
678677 if b_name in board_options and board_options [b_name ]:
679- return board_fqbn [b_name ] + "," + board_options [b_name ]
678+ return f" { board_fqbn [b_name ]} , { board_options [b_name ]} "
680679 else :
681680 return board_fqbn [b_name ]
682681
@@ -728,17 +727,6 @@ def build_config(sketch, boardSkipped):
728727 if build_conf_list [idx ][0 ] in na_sketch_pattern :
729728 for pattern in na_sketch_pattern [build_conf_list [idx ][0 ]]:
730729 if re .search (pattern , str (sketch ), re .IGNORECASE ):
731- print (
732- (build_format_result ).format (
733- "{}/{}" .format (
734- build_conf_list [idx ][1 ], build_conf_list [idx ][2 ]
735- ),
736- build_conf_list [idx ][0 ],
737- fskip ,
738- 0.00 ,
739- )
740- )
741-
742730 boardSkipped .append (build_conf_list [idx ][0 ])
743731 del build_conf_list [idx ]
744732 nb_build_skipped += 1
@@ -771,8 +759,7 @@ def build_all():
771759 for sketch_nb , sketch in enumerate (sketch_list , start = 1 ):
772760 boardKo = []
773761 boardSkipped = []
774- print ("\n " )
775- print (build_separator )
762+ print (f"\n { build_separator } " )
776763 print (
777764 "| {:^85} |" .format (
778765 f"Sketch \033 [34m{ sketch .name } \033 [0m ({ sketch_nb } /{ len (sketch_list )} )"
0 commit comments