[Test] Help lcov find ragel parts sans hacks

diff --git a/circle.yml b/circle.yml
index dff1f1d2a9bb8fb7851cfe85d052b8b2bab7ece2..fd1665a816ea15b6eb5bac820b80b36dde0609c2 100644 (file)
--- 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 8896e229f18d27ca501e62c7316ddd68cdcb4ea2..1557cdc857efdb6d05569938971e80935e0fc3e7 100644 (file)
--- 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)