diff options
| -rwxr-xr-x | cpp/test/IceSSL/configuration/run.py | 2 | ||||
| -rwxr-xr-x | scripts/TestUtil.py | 8 |
2 files changed, 8 insertions, 2 deletions
diff --git a/cpp/test/IceSSL/configuration/run.py b/cpp/test/IceSSL/configuration/run.py index 07e001c4fdc..8edf98af0f8 100755 --- a/cpp/test/IceSSL/configuration/run.py +++ b/cpp/test/IceSSL/configuration/run.py @@ -43,7 +43,7 @@ if TestUtil.isDarwin(): os.system("security create-keychain -p password %s" % keychainPath) for cert in ["s_rsa_ca1.p12", "c_rsa_ca1.p12"]: os.system("security import %s -f pkcs12 -A -P password -k %s" % (os.path.join(certsPath, cert), keychainPath)) -elif TestUtil.isLinux(): +elif TestUtil.iceUseOpenSSL(): # # Create copies of the CA certificates named after the subject # hash. This is used by the tests to find the CA certificates in diff --git a/scripts/TestUtil.py b/scripts/TestUtil.py index a838398f1b3..5a151a9525e 100755 --- a/scripts/TestUtil.py +++ b/scripts/TestUtil.py @@ -127,11 +127,17 @@ def isYocto(): return isLinux() and linuxDistribution and linuxDistribution == "Yocto" def isDebian(): - return isLinux() and linuxDistribution and linuxDistribution == "Debian" + return (isLinux() and linuxDistribution and linuxDistribution == "Debian") or isDebianFreeBSD() def isSles(): return isLinux() and linuxDistribution and linuxDistribution == "SUSE LINUX" +def iceUseOpenSSL(): + return any(sys.platform.startswith(p) for p in ["linux", "freebsd", "gnukfreebsd"]) + +def isDebianFreeBSD(): + return sys.platform.startswith("gnukfreebsd") + def getCppCompiler(): compiler = "" if os.environ.get("CPP_COMPILER", "") != "": |