Fix SSL configuration test to create Find.keychain

2 files changed, 19 insertions, 0 deletions

diff --git a/cpp/test/IceSSL/certs/Find.keychain b/cpp/test/IceSSL/certs/Find.keychain
deleted file mode 100644
index 7d4ba5745a2..00000000000
--- a/cpp/test/IceSSL/certs/Find.keychain
+++ /dev/null
diff --git a/cpp/test/IceSSL/configuration/run.py b/cpp/test/IceSSL/configuration/run.py
index a67b5e2e920..44891d3bbe6 100755
--- a/cpp/test/IceSSL/configuration/run.py
+++ b/cpp/test/IceSSL/configuration/run.py
@@ -20,4 +20,23 @@ if len(path) == 0:
 sys.path.append(os.path.join(path[0], "scripts"))
 import TestUtil
 
+certsPath = os.path.abspath(os.path.join(os.getcwd(), "..", "certs"))
+keychainPath = os.path.abspath(os.path.join(certsPath, "Find.keychain"))
+
+if TestUtil.isDarwin():
+    try:
+        os.remove(keychainPath)
+    except OSError:
+        pass
+
+    os.system("security create-keychain -p password %s" % keychainPath)
+    for cert in ["s_rsa_ca1.pfx", "c_rsa_ca1.pfx"]:
+        os.system("security import %s -f pkcs12 -A -P password -k %s" % (os.path.join(certsPath, cert), keychainPath))
+
 TestUtil.clientServerTest(additionalClientOptions = '"%s"' % os.getcwd())
+
+if TestUtil.isDarwin():
+    try:
+        os.remove(keychainPath)
+    except OSError:
+        pass