Commit bdad1e2
tools: make --repeat work with -j in test.py
The repeat option in test.py did not work as expected if `-j` was set to
more than one. Repeated tests running at the same time could share temp
directories and cause test failures. This was observed with:
tools/test.py -J --repeat=10 parallel/test-fs-watch-recursive
By using copy.deepCopy(), the repeated tests are separate objects and
not references to the same objects. Setting `thread_id` on one of them
will now not change the `thread_id` on all of them. And `thread_id` is
how the temp directory (and common.PORT as well) are determined.
Refs: #9228
PR-URL: #9249
Reviewed-By: Sakthipriyan Vairamani <thechargingvolcano@gmail.com>
Reviewed-By: Gibson Fahnestock <gibfahn@gmail.com>
Reviewed-By: Michael Dawson <michael_dawson@ca.ibm.com>
Reviewed-By: James M Snell <jasnell@gmail.com>
Reviewed-By: Santiago Gimeno <santiago.gimeno@gmail.com>1 parent f39eb05 commit bdad1e2
1 file changed
Lines changed: 4 additions & 1 deletion
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -42,6 +42,7 @@ | |||
| 42 | 42 | import utils | |
| 43 | 43 | import multiprocessing | |
| 44 | 44 | import errno | |
| 45 | + import copy | ||
| 45 | 46 | ||
| 46 | 47 | from os.path import join, dirname, abspath, basename, isdir, exists | |
| 47 | 48 | from datetime import datetime | |
@@ -773,7 +774,9 @@ def AddTestsToList(self, result, current_path, path, context, arch, mode): | |||
| 773 | 774 | tests = self.GetConfiguration(context).ListTests(current_path, path, | |
| 774 | 775 | arch, mode) | |
| 775 | 776 | for t in tests: t.variant_flags = v | |
| 776 | - result += tests * context.repeat | ||
| 777 | + result += tests | ||
| 778 | + for i in range(1, context.repeat): | ||
| 779 | + result += copy.deepcopy(tests) | ||
| 777 | 780 | ||
| 778 | 781 | def GetTestStatus(self, context, sections, defs): | |
| 779 | 782 | self.GetConfiguration(context).GetTestStatus(sections, defs) | |
0 commit comments