diff options
| author | Benoit Foucher <benoit@zeroc.com> | 2017-06-16 17:56:16 +0200 |
|---|---|---|
| committer | Benoit Foucher <benoit@zeroc.com> | 2017-06-16 17:56:16 +0200 |
| commit | 2b12f731cfa1750c624527341be60b573603fce3 (patch) | |
| tree | b9f117a637807bdefe0aa9ed329e6108695dbd2b /scripts/LocalDriver.py | |
| parent | Potential fix for ICE-8076 and ICE-8077 - use a domain ID for IceDiscovery/si... (diff) | |
| download | ice-2b12f731cfa1750c624527341be60b573603fce3.tar.bz2 ice-2b12f731cfa1750c624527341be60b573603fce3.tar.xz ice-2b12f731cfa1750c624527341be60b573603fce3.zip | |
Fixed iOS/UWP testing to ignore --workers, it's not supported yet
Diffstat (limited to 'scripts/LocalDriver.py')
| -rw-r--r-- | scripts/LocalDriver.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/scripts/LocalDriver.py b/scripts/LocalDriver.py index 9ec6db4aab9..e4c6a4a0a79 100644 --- a/scripts/LocalDriver.py +++ b/scripts/LocalDriver.py @@ -25,8 +25,8 @@ class Executor: self.continueOnFailure = continueOnFailure self.lock = threading.Lock() - def submit(self, testsuite, crossMappings): - mainThreadOnly = testsuite.isMainThreadOnly() or self.workers == 0 + def submit(self, testsuite, crossMappings, driver): + mainThreadOnly = testsuite.isMainThreadOnly(driver) or self.workers == 0 # # If the test supports workers and we are cross testing, ensure that all the cross @@ -391,7 +391,7 @@ class LocalDriver(Driver): continue elif isinstance(self.runner, RemoteTestCaseRunner) and not testsuite.isMultiHost(): continue - executor.submit(testsuite, Mapping.getAll() if self.allCross else [self.cross]) + executor.submit(testsuite, Mapping.getAll() if self.allCross else [self.cross], self) # # Run all the tests and wait for the executor to complete. |