aboutsummaryrefslogtreecommitdiff
path: root/unittest/conftest.py
diff options
context:
space:
mode:
authorSzczepan Zalega <szczepan@nitrokey.com>2017-10-03 19:23:49 +0200
committerSzczepan Zalega <szczepan@nitrokey.com>2017-10-04 19:19:57 +0200
commit2ea2883145b2ad06d437d3fcf06026583109791a (patch)
tree88287fc5bd2ddd52abcd7aedb2680ba81c317871 /unittest/conftest.py
parent1184f21319d6bfda2aa81e4170f9559a86a8fc6e (diff)
downloadlibnitrokey-2ea2883145b2ad06d437d3fcf06026583109791a.tar.gz
libnitrokey-2ea2883145b2ad06d437d3fcf06026583109791a.tar.bz2
Remove libnitrokey-log and add a switch to choose version instead
Signed-off-by: Szczepan Zalega <szczepan@nitrokey.com>
Diffstat (limited to 'unittest/conftest.py')
-rw-r--r--unittest/conftest.py4
1 files changed, 1 insertions, 3 deletions
diff --git a/unittest/conftest.py b/unittest/conftest.py
index 04e85ff..8c9899c 100644
--- a/unittest/conftest.py
+++ b/unittest/conftest.py
@@ -33,11 +33,9 @@ def C(request):
import os, sys
path_build = os.path.join("..", "build")
paths = [
- os.path.join(path_build,"libnitrokey-log.so"),
os.path.join(path_build,"libnitrokey.so"),
- os.path.join(path_build,"libnitrokey-log.dll"),
+ os.path.join(path_build,"libnitrokey.dylib"),
os.path.join(path_build,"libnitrokey.dll"),
- os.path.join(path_build,"nitrokey-log.dll"),
os.path.join(path_build,"nitrokey.dll"),
]
for p in paths: