Merge remote-tracking branch 'origin/master' into PRperfimprov

npf/regression.py

@@ -144,13 +144,7 @@ def compare(self,
             build.writeversion(test, all_results, allow_overwrite = True)
         return tests_passed, tests_total
 
-    def regress_all_tests(self,
-                          tests: List['Test'],
-                          options,
-                          history: int = 1,
-                          on_finish = None,
-                          do_compare:bool = True,
-                          iserie=0, nseries=1) -> Tuple[Build, List[Dataset], List[Dataset]]:
+    def regress_all_tests(self, tests: List['Test'], options, history: int = 1, on_finish = None, iserie=0, nseries=1) -> Tuple[Build, List[Dataset]]:
         """
         Execute all tests passed in argument for the last build of the regressor associated repository
         :param history: Start regression at last build + 1 - history

npf_compare.py

@@ -30,7 +30,7 @@ def main():
 
     npf.add_verbosity_options(parser)
 
-    parser.add_argument('repos', metavar='repo', type=str, nargs='+', help='names of the repositories to compares. Use a format such as repo+VAR=VAL:Title to overwrite variables and serie name.')
+    parser.add_argument('repos', metavar='repo', type=str, nargs='+', help='names of the repositories to compare. Use a format such as repo+VAR=VAL:Title to overwrite variables and serie name.')
     parser.add_argument('--graph-title', type=str, nargs='?', help='Graph title')
 
     b = npf.add_building_options(parser)
@@ -62,7 +62,7 @@ def main():
                                                 group_series(filename,args,series,time_series,options=args) if args.iterative else None
                                         )
 
-    group_series(filename, series, time_series, options=args)
+    do_graph(filename, args, series, time_series, options=args)
 
 if __name__ == "__main__":
     multiprocessing.set_start_method('forkserver')