@@ -639,10 +639,9 @@ def log_sketch_build_result(sketch, boardKo, boardSkipped):
639
639
# Log final result
640
640
def log_final_result ():
641
641
# Also equal to len(board_fqbn) * len(sketch_list)
642
- nb_build_total = nb_build_passed + nb_build_failed + nb_build_skipped
642
+ nb_build_total = nb_build_passed + nb_build_failed
643
643
stat_passed = round (nb_build_passed * 100.0 / nb_build_total , 2 )
644
644
stat_failed = round (nb_build_failed * 100.0 / nb_build_total , 2 )
645
- stat_skipped = round (nb_build_skipped * 100.0 / nb_build_total , 2 )
646
645
duration = str (timedelta (seconds = time .time () - full_buildTime ))
647
646
648
647
# Log file
@@ -652,8 +651,8 @@ def log_final_result():
652
651
f .write (build_separator + "\n " )
653
652
ssucc = f"{ nb_build_passed } succeeded ({ stat_passed } %)"
654
653
sfail = f"{ nb_build_failed } failed ({ stat_failed } %)"
655
- sskip = f"{ nb_build_skipped } skipped ( { stat_skipped } % )"
656
- f .write (f"{ ssucc } , { sfail } , { sskip } of { nb_build_total } builds\n " )
654
+ sskip = f"{ nb_build_skipped } skipped)"
655
+ f .write (f"{ ssucc } , { sfail } of { nb_build_total } builds ( { sskip } ) \n " )
657
656
f .write (f"Ends { time .strftime ('%A %d %B %Y %H:%M:%S' )} \n " )
658
657
f .write (f"Duration: { duration } \n " )
659
658
f .write (f"Logs are available here:\n { output_dir } \n " )
@@ -662,8 +661,8 @@ def log_final_result():
662
661
# Standard output
663
662
ssucc = f"{ nb_build_passed } { fsucc } ({ stat_passed } %)"
664
663
sfail = f"{ nb_build_failed } { ffail } ({ stat_failed } %)"
665
- sskip = f"{ nb_build_skipped } { fskip } ( { stat_skipped } %) "
666
- print (f"Builds Summary: { ssucc } , { sfail } , { sskip } of { nb_build_total } builds" )
664
+ sskip = f"{ nb_build_skipped } { fskip } "
665
+ print (f"Builds Summary: { ssucc } , { sfail } of { nb_build_total } builds ( { sskip } ) " )
667
666
print (f"Duration: { duration } " )
668
667
print ("Logs are available here:" )
669
668
print (output_dir )
@@ -675,7 +674,7 @@ def get_fqbn(b_name):
675
674
return board_custom_fqbn [b_name ]
676
675
else :
677
676
if b_name in board_options and board_options [b_name ]:
678
- return board_fqbn [b_name ] + "," + board_options [b_name ]
677
+ return f" { board_fqbn [b_name ]} , { board_options [b_name ]} "
679
678
else :
680
679
return board_fqbn [b_name ]
681
680
@@ -727,17 +726,6 @@ def build_config(sketch, boardSkipped):
727
726
if build_conf_list [idx ][0 ] in na_sketch_pattern :
728
727
for pattern in na_sketch_pattern [build_conf_list [idx ][0 ]]:
729
728
if re .search (pattern , str (sketch ), re .IGNORECASE ):
730
- print (
731
- (build_format_result ).format (
732
- "{}/{}" .format (
733
- build_conf_list [idx ][1 ], build_conf_list [idx ][2 ]
734
- ),
735
- build_conf_list [idx ][0 ],
736
- fskip ,
737
- 0.00 ,
738
- )
739
- )
740
-
741
729
boardSkipped .append (build_conf_list [idx ][0 ])
742
730
del build_conf_list [idx ]
743
731
nb_build_skipped += 1
@@ -770,8 +758,7 @@ def build_all():
770
758
for sketch_nb , sketch in enumerate (sketch_list , start = 1 ):
771
759
boardKo = []
772
760
boardSkipped = []
773
- print ("\n " )
774
- print (build_separator )
761
+ print (f"\n { build_separator } " )
775
762
print (
776
763
"| {:^85} |" .format (
777
764
f"Sketch \033 [34m{ sketch .name } \033 [0m ({ sketch_nb } /{ len (sketch_list )} )"
0 commit comments