[Test] Use out of tree build for tests/code coverage

 - Also a loosely-related fix for test library

diff --git a/circle.yml b/circle.yml
index 178fcb97aadeb32e0b54438f6def9181090aa824..2ecec8713a27f98b0fd9419b44d5b1ecd39f1335 100644 (file)
--- a/circle.yml
+++ b/circle.yml
@@ -7,12 +7,12 @@ dependencies:
 
 test:
   override:
-    - cmake . -DENABLE_COVERAGE=ON -DCMAKE_INSTALL_PREFIX=./_install
-    - cmake --build . --target install
-    - sudo robot test/functional/cases
-    - lcov --no-external -b . -d . -c --output-file coverage.info
-    - lcov -r coverage.info *.rl
-    - ln -s src/ragel .
+    - mkdir ../build ; mkdir ../install ; cd ../build
+    - cmake ../rspamd -DENABLE_COVERAGE=ON -DCMAKE_INSTALL_PREFIX=../install
+    - make install
+    - RSPAMADM=../install/bin/rspamadm RSPAMC=../install/bin/rspamc RSPAMD=../install/bin/rspamd sudo -E robot ../rspamd/test/functional/cases
+    - lcov --no-external -b ../rspamd -d ../rspamd -c --output-file coverage.info
+    - ln -s ../rspamd/src/ragel ../rspamd
     - if [ ! -z $COVERALLS_REPO_TOKEN ]; then coveralls-lcov -t ${COVERALLS_REPO_TOKEN} coverage.info; fi
   post:
     - for i in output.xml log.html report.html; do mv $i $CIRCLE_ARTIFACTS; done

diff --git a/test/functional/lib/rspamd.py b/test/functional/lib/rspamd.py
index d45faa794e6052ac45eafac5a3719b0460e4f093..31e79b095e59307776b3cd8d9c71512716abc7cc 100644 (file)
--- a/test/functional/lib/rspamd.py
+++ b/test/functional/lib/rspamd.py
@@ -56,7 +56,7 @@ def get_rspamc():
     return dname + "/src/client/rspamc"
 def get_rspamadm():
     if os.environ.get('RSPAMADM'):
-        return environ['RSPAMADM']
+        return os.environ['RSPAMADM']
     dname = get_top_dir()
     return dname + "/src/rspamadm/rspamadm"