diff options
| author | Benoit Foucher <benoit@zeroc.com> | 2016-12-13 17:40:25 +0100 |
|---|---|---|
| committer | Benoit Foucher <benoit@zeroc.com> | 2016-12-13 17:40:25 +0100 |
| commit | be3f1d1fc29f0b13c26149a5e654e335eda75450 (patch) | |
| tree | 3a41e2a92b3dfd6606ee212e1a2e476db4c321d3 /scripts/tests/IceSSL/configuration.py | |
| parent | Another fix for Windows bin PATH (diff) | |
| download | ice-be3f1d1fc29f0b13c26149a5e654e335eda75450.tar.bz2 ice-be3f1d1fc29f0b13c26149a5e654e335eda75450.tar.xz ice-be3f1d1fc29f0b13c26149a5e654e335eda75450.zip | |
Support for C++ iOS Simulator controller
Diffstat (limited to 'scripts/tests/IceSSL/configuration.py')
| -rw-r--r-- | scripts/tests/IceSSL/configuration.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/scripts/tests/IceSSL/configuration.py b/scripts/tests/IceSSL/configuration.py index 1d4f832b49f..7c951fa8bd5 100644 --- a/scripts/tests/IceSSL/configuration.py +++ b/scripts/tests/IceSSL/configuration.py @@ -16,7 +16,7 @@ class ConfigurationTestCase(ClientServerTestCase): return certsPath = os.path.abspath(os.path.join(self.getPath(), "..", "certs")) - if isinstance(platform, Darwin): + if isinstance(platform, Darwin) and current.config.buildPlatform == "macosx": keychainPath = os.path.join(certsPath, "Find.keychain") os.system("mkdir -p {0}".format(os.path.join(certsPath, "keychain"))) os.system("security create-keychain -p password %s" % keychainPath) @@ -38,7 +38,7 @@ class ConfigurationTestCase(ClientServerTestCase): return certsPath = os.path.abspath(os.path.join(self.getPath(), "..", "certs")) - if isinstance(platform, Darwin): + if isinstance(platform, Darwin) and current.config.buildPlatform == "macosx": os.system("rm -rf {0} {1}".format(os.path.join(certsPath, "keychain"), os.path.join(certsPath, "Find.keychain"))) elif platform.hasOpenSSL(): for c in ["cacert1.pem", "cacert2.pem"]: |