diff options
| author | Andrew Lewis <nerf@judo.za.org> | 2016-08-16 13:30:23 +0200 |
|---|---|---|
| committer | Andrew Lewis <nerf@judo.za.org> | 2016-08-16 13:30:23 +0200 |
| commit | 5124bd8ae13ffbee3110242167f1a19e94a74d67 (patch) | |
| tree | 2658d9894c6ea34fb9bc15739fb07497f6ff7569 | |
| parent | 5cf3a74fbd1d0ba0c59d50bfec91777fe4853dd2 (diff) | |
| download | rspamd-5124bd8ae13ffbee3110242167f1a19e94a74d67.tar.gz rspamd-5124bd8ae13ffbee3110242167f1a19e94a74d67.zip | |
[Test] Use out of tree build for tests/code coverage
- Also a loosely-related fix for test library
| -rw-r--r-- | circle.yml | 12 | ||||
| -rw-r--r-- | test/functional/lib/rspamd.py | 2 |
2 files changed, 7 insertions, 7 deletions
diff --git a/circle.yml b/circle.yml index 178fcb97a..2ecec8713 100644 --- 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 d45faa794..31e79b095 100644 --- 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" |