updated test paths

proycon · Nov 13, 2016 · 70cf132 · 70cf132
1 parent 5eee5db
commit 70cf132
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 2 deletions.
diff --git a/clam/common/data.py b/clam/common/data.py
@@ -37,6 +37,10 @@
 
 VERSION = '2.1.6'
 
+#dirs for services shipped with CLAM itself
+CONFIGDIR = os.path.abspath(os.path.dirname(__file__) + '/../config/')
+WRAPPERDIR = os.path.abspath(os.path.dirname(__file__) + '/../wrappers/')
+
 #clam.common.formats is deliberately imported _at the end_
 
 DISALLOWINSHELLSAFE = ('|','&',';','!','<','>','{','}','`','\n','\r','\t')

diff --git a/clam/config/authtest.py b/clam/config/authtest.py
@@ -150,7 +150,7 @@
 #                        (set to "anonymous" if there is none)
 #     $PARAMETERS      - List of chosen parameters, using the specified flags
 #
-COMMAND = sys.path[0] + "/wrappers/textstats.py $DATAFILE $STATUSFILE $OUTPUTDIRECTORY"
+COMMAND = WRAPPERDIR + "/textstats.py $DATAFILE $STATUSFILE $OUTPUTDIRECTORY"
 
 # ======== PARAMETER DEFINITIONS ===========
 

diff --git a/clam/config/test.py b/clam/config/test.py
@@ -109,7 +109,7 @@
 #                        (set to "anonymous" if there is none)
 #     $PARAMETERS      - List of chosen parameters, using the specified flags
 #
-COMMAND = sys.path[0] + "/wrappers/testwrapper.py $DATAFILE $STATUSFILE $OUTPUTDIRECTORY $PARAMETERS > $OUTPUTDIRECTORY/log"
+COMMAND = WRAPPERDIR + "/testwrapper.py $DATAFILE $STATUSFILE $OUTPUTDIRECTORY $PARAMETERS > $OUTPUTDIRECTORY/log"
 
 #The parameters are subdivided into several group. In the form of a list of (groupname, parameters) tuples. The parameters are a list of instances from common/parameters.py
 PARAMETERS =  [