@@ -586,19 +586,6 @@ def main(self, tests=None, **kwargs):
586
586
self ._main (tests , kwargs )
587
587
588
588
def _main (self , tests , kwargs ):
589
- self .ns = self .parse_args (kwargs )
590
-
591
- self .getloadavg = None
592
- if hasattr (os , 'getloadavg' ):
593
- def getloadavg_1m ():
594
- return os .getloadavg ()[0 ]
595
- self .getloadavg = getloadavg_1m
596
- elif sys .platform == 'win32' and (self .ns .slaveargs is None ):
597
- from test .libregrtest .win_utils import WindowsLoadTracker
598
-
599
- load_tracker = WindowsLoadTracker ()
600
- self .getloadavg = load_tracker .getloadavg
601
-
602
589
if self .ns .huntrleaks :
603
590
warmup , repetitions , _ = self .ns .huntrleaks
604
591
if warmup < 1 or repetitions < 1 :
@@ -629,6 +616,19 @@ def getloadavg_1m():
629
616
self .list_cases ()
630
617
sys .exit (0 )
631
618
619
+ self .getloadavg = None
620
+ # If we're on windows and this is the parent runner (not a worker),
621
+ # report the load average.
622
+ if hasattr (os , 'getloadavg' ):
623
+ def getloadavg_1m ():
624
+ return os .getloadavg ()[0 ]
625
+ self .getloadavg = getloadavg_1m
626
+ elif sys .platform == 'win32' and (self .ns .worker_args is None ):
627
+ from test .libregrtest .win_utils import WindowsLoadTracker
628
+
629
+ load_tracker = WindowsLoadTracker ()
630
+ self .getloadavg = load_tracker .getloadavg
631
+
632
632
self .run_tests ()
633
633
self .display_result ()
634
634
0 commit comments