diff options
| author | Jose <jose@zeroc.com> | 2023-03-13 14:02:07 +0100 |
|---|---|---|
| committer | Jose <jose@zeroc.com> | 2023-03-13 14:02:07 +0100 |
| commit | c66d1d8e6095c3a013e3f304303adfcc3303d610 (patch) | |
| tree | 3ac9323a260a411b4b69a41e1b03a57fb6c181ef /scripts/Util.py | |
| parent | Update OpenSSL packages used by windows builds (diff) | |
| download | ice-3.7.9-rc0.tar.bz2 ice-3.7.9-rc0.tar.xz ice-3.7.9-rc0.zip | |
Fix fallback path for Swift iOS test driverv3.7.9-rc0
Diffstat (limited to 'scripts/Util.py')
| -rw-r--r-- | scripts/Util.py | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/scripts/Util.py b/scripts/Util.py index 2f582c8b3ca..7467d5115ad 100644 --- a/scripts/Util.py +++ b/scripts/Util.py @@ -4059,15 +4059,14 @@ class SwiftMapping(Mapping): targetBuildDir = re.search("\sTARGET_BUILD_DIR = (.*)", run(cmd)).groups(1)[0] testDriver = os.path.join(targetBuildDir, "TestDriver.app") - if os.path.exists(testDriver): - return testDriver - else: + if not os.path.exists(testDriver): # Fallback location, required with Xcode 14.2 - return os.path.join( + testDriver = os.path.join( current.testcase.getMapping().getPath(), "build", "{0}-{1}".format(current.config.buildConfig, current.config.buildPlatform), - "/TestDriver.app") + "TestDriver.app") + return testDriver def getSSLProps(self, process, current): props = Mapping.getByName("cpp").getSSLProps(process, current) |