Skip to content

Commit a8df864

Browse files
committed
Add comment explaining check in libregrtest
1 parent 5c0e275 commit a8df864

File tree

1 file changed

+13
-13
lines changed

1 file changed

+13
-13
lines changed

Lib/test/libregrtest/main.py

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -586,19 +586,6 @@ def main(self, tests=None, **kwargs):
586586
self._main(tests, kwargs)
587587

588588
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-
602589
if self.ns.huntrleaks:
603590
warmup, repetitions, _ = self.ns.huntrleaks
604591
if warmup < 1 or repetitions < 1:
@@ -629,6 +616,19 @@ def getloadavg_1m():
629616
self.list_cases()
630617
sys.exit(0)
631618

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+
632632
self.run_tests()
633633
self.display_result()
634634

0 commit comments

Comments
 (0)