diff options
| author | Andrew Lewis <nerf@judo.za.org> | 2016-09-29 15:54:13 +0200 |
|---|---|---|
| committer | Andrew Lewis <nerf@judo.za.org> | 2016-09-29 15:54:13 +0200 |
| commit | 9eb1afdb15d27c4822d42770db8431536d9dfce9 (patch) | |
| tree | e9f60356a5923f26d8929c382ab63999b9caa983 | |
| parent | 337ca0640698f11ca8ff5cbaa023b73f610315f4 (diff) | |
| download | rspamd-9eb1afdb15d27c4822d42770db8431536d9dfce9.tar.gz rspamd-9eb1afdb15d27c4822d42770db8431536d9dfce9.zip | |
[Test] Help lcov find ragel parts sans hacks
| -rw-r--r-- | circle.yml | 1 | ||||
| -rw-r--r-- | src/CMakeLists.txt | 6 |
2 files changed, 3 insertions, 4 deletions
diff --git a/circle.yml b/circle.yml index dff1f1d2a..fd1665a81 100644 --- a/circle.yml +++ b/circle.yml @@ -15,7 +15,6 @@ test: - make install - RSPAMADM=../install/bin/rspamadm RSPAMC=../install/bin/rspamc RSPAMD=../install/bin/rspamd sudo -E robot -x xunit.xml ../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/src/CMakeLists.txt b/src/CMakeLists.txt index 8896e229f..1557cdc85 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -108,17 +108,17 @@ SET(RAGEL_DEPENDS "${CMAKE_SOURCE_DIR}/src/ragel/smtp_address.rl" "${CMAKE_SOURCE_DIR}/src/ragel/smtp_whitespace.rl" "${CMAKE_SOURCE_DIR}/src/ragel/smtp_received.rl") RAGEL_TARGET(ragel_smtp_addr - INPUTS ragel/smtp_addr_parser.rl + INPUTS ${CMAKE_SOURCE_DIR}/src/ragel/smtp_addr_parser.rl DEPENDS ${RAGEL_DEPENDS} COMPILE_FLAGS -T1 OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/smtp_addr_parser.rl.c) RAGEL_TARGET(ragel_smtp_received - INPUTS ragel/smtp_received_parser.rl + INPUTS ${CMAKE_SOURCE_DIR}/src/ragel/smtp_received_parser.rl DEPENDS ${RAGEL_DEPENDS} COMPILE_FLAGS -T1 OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/smtp_received_parser.rl.c) RAGEL_TARGET(ragel_newlines_strip - INPUTS ragel/newlines_strip.rl + INPUTS ${CMAKE_SOURCE_DIR}/src/ragel/newlines_strip.rl DEPENDS ${RAGEL_DEPENDS} COMPILE_FLAGS -G2 OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/newlines_strip.rl.c) |