aboutsummaryrefslogtreecommitdiff
path: root/unittest/conftest.py
diff options
context:
space:
mode:
authorSzczepan Zalega <szczepan@nitrokey.com>2017-10-11 18:16:10 +0200
committerSzczepan Zalega <szczepan@nitrokey.com>2017-10-11 18:16:10 +0200
commit91f88b15f011abe85c85893d1fe50de6c8e4189d (patch)
tree40c5819c29bd7ec047819c5d7eac0acb68be1ada /unittest/conftest.py
parentd9adae46dae6e2176e8765368d2902cc24da688b (diff)
parent1a446933032beca0b1c5764acf23940ceb7a43ab (diff)
downloadlibnitrokey-91f88b15f011abe85c85893d1fe50de6c8e4189d.tar.gz
libnitrokey-91f88b15f011abe85c85893d1fe50de6c8e4189d.tar.bz2
Merge branch 'general-fixes'v3.1
Diffstat (limited to 'unittest/conftest.py')
-rw-r--r--unittest/conftest.py5
1 files changed, 3 insertions, 2 deletions
diff --git a/unittest/conftest.py b/unittest/conftest.py
index ef4539c..a53b005 100644
--- a/unittest/conftest.py
+++ b/unittest/conftest.py
@@ -36,13 +36,15 @@ def C(request):
import os, sys
path_build = os.path.join("..", "build")
paths = [
+ os.environ.get('LIBNK_PATH', None),
os.path.join(path_build,"libnitrokey.so"),
os.path.join(path_build,"libnitrokey.dylib"),
os.path.join(path_build,"libnitrokey.dll"),
os.path.join(path_build,"nitrokey.dll"),
]
for p in paths:
- print(p)
+ if not p: continue
+ print("Trying " +p)
p = os.path.abspath(p)
if os.path.exists(p):
print("Found: "+p)
@@ -50,7 +52,6 @@ def C(request):
break
else:
print("File does not exist: " + p)
- print("Trying another")
if not C:
print("No library file found")
sys.exit(1)