diff options
| author | Vsevolod Stakhov <vsevolod@highsecure.ru> | 2015-07-09 14:45:48 +0100 |
|---|---|---|
| committer | Vsevolod Stakhov <vsevolod@highsecure.ru> | 2015-07-09 14:45:48 +0100 |
| commit | c20631bd67eaf070b8a37d298c627824df33eaff (patch) | |
| tree | f3a4532457c310257e927686eea3d11eff0e6dfb /test | |
| parent | 864de26de100c10f95501cd9ebf647360be7252e (diff) | |
| download | rspamd-c20631bd67eaf070b8a37d298c627824df33eaff.tar.gz rspamd-c20631bd67eaf070b8a37d298c627824df33eaff.zip | |
Adopt build system for new tests.
Diffstat (limited to 'test')
| -rw-r--r-- | test/CMakeLists.txt | 12 | ||||
| -rw-r--r-- | test/functional/configs/lua_test.conf | 2 | ||||
| -rw-r--r-- | test/functional/configs/stats.conf | 2 | ||||
| -rw-r--r-- | test/functional/configs/trivial.conf | 2 |
4 files changed, 9 insertions, 9 deletions
diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt index 1bc0a9061..a133935e6 100644 --- a/test/CMakeLists.txt +++ b/test/CMakeLists.txt @@ -30,8 +30,8 @@ TARGET_LINK_LIBRARIES(rspamd-test stemmer) TARGET_LINK_LIBRARIES(rspamd-test rspamd-actrie) ADD_CUSTOM_TARGET(rspamd-func-test COMMAND - "${CMAKE_SOURCE_DIR}/contrib/bats/bats" - "${CMAKE_CURRENT_BINARY_DIR}/functional/tests.bats") + "/bin/sh" + "${CMAKE_CURRENT_BINARY_DIR}/functional/tests.sh") ADD_DEPENDENCIES(rspamd-func-test rspamd-test) ADD_DEPENDENCIES(rspamd-func-test rspamc) @@ -43,7 +43,7 @@ IF(NOT "${CMAKE_CURRENT_SOURCE_DIR}" STREQUAL "${CMAKE_CURRENT_BINARY_DIR}") ADD_CUSTOM_TARGET(units-dir COMMAND ${CMAKE_COMMAND} -E make_directory "${CMAKE_CURRENT_BINARY_DIR}/lua/unit" ) - ADD_DEPENDENCIES(rspamd-test units-dir) + ADD_DEPENDENCIES(rspamd-func-test units-dir) FOREACH(_LF IN LISTS LUA_TESTS) GET_FILENAME_COMPONENT(_NM "${_LF}" NAME) IF("${_LF}" MATCHES "^.*/unit/.*$") @@ -55,7 +55,7 @@ IF(NOT "${CMAKE_CURRENT_SOURCE_DIR}" STREQUAL "${CMAKE_CURRENT_BINARY_DIR}") ${CMAKE_COMMAND} -E copy_if_different ${_LF} ${_DS} SOURCES "${_LF}" ) - ADD_DEPENDENCIES(rspamd-test "${_NM}") + ADD_DEPENDENCIES(rspamd-func-test "${_NM}") ENDFOREACH() ADD_CUSTOM_TARGET(functional-dir COMMAND @@ -65,7 +65,7 @@ IF(NOT "${CMAKE_CURRENT_SOURCE_DIR}" STREQUAL "${CMAKE_CURRENT_BINARY_DIR}") COMMAND ${CMAKE_COMMAND} -E make_directory "${CMAKE_CURRENT_BINARY_DIR}/functional/messages" ) - ADD_DEPENDENCIES(rspamd-test functional-dir) + ADD_DEPENDENCIES(rspamd-func-test functional-dir) FILE(GLOB_RECURSE BATS_TESTS "${CMAKE_CURRENT_SOURCE_DIR}/functional/*") FOREACH(_LF IN LISTS BATS_TESTS) GET_FILENAME_COMPONENT(_NM "${_LF}" NAME) @@ -75,6 +75,6 @@ IF(NOT "${CMAKE_CURRENT_SOURCE_DIR}" STREQUAL "${CMAKE_CURRENT_BINARY_DIR}") ${CMAKE_COMMAND} -E copy_if_different ${_LF} ${_DS} SOURCES "${_LF}" ) - ADD_DEPENDENCIES(rspamd-test "${_NM}") + ADD_DEPENDENCIES(rspamd-func-test "${_NM}") ENDFOREACH() ENDIF()
\ No newline at end of file diff --git a/test/functional/configs/lua_test.conf b/test/functional/configs/lua_test.conf index 2ff07ac60..c1ade3636 100644 --- a/test/functional/configs/lua_test.conf +++ b/test/functional/configs/lua_test.conf @@ -1,6 +1,6 @@ options = { filters = ["spf", "dkim", "regexp"] - url_tld = "${CURDIR}/lua/unit/test_tld.dat" + url_tld = "${TESTDIR}/../lua/unit/test_tld.dat" dns = { nameserver = "8.8.8.8" } diff --git a/test/functional/configs/stats.conf b/test/functional/configs/stats.conf index a70fc5aed..709796640 100644 --- a/test/functional/configs/stats.conf +++ b/test/functional/configs/stats.conf @@ -1,6 +1,6 @@ options = { filters = ["spf", "dkim", "regexp"] - url_tld = "${TESTDIR}/lua/unit/test_tld.dat" + url_tld = "${TESTDIR}/../lua/unit/test_tld.dat" dns = { nameserver = "8.8.8.8" } diff --git a/test/functional/configs/trivial.conf b/test/functional/configs/trivial.conf index 0b706c31c..9aaa4faab 100644 --- a/test/functional/configs/trivial.conf +++ b/test/functional/configs/trivial.conf @@ -1,6 +1,6 @@ options = { filters = ["spf", "dkim", "regexp"] - url_tld = "${TESTDIR}/lua/unit/test_tld.dat" + url_tld = "${TESTDIR}/../lua/unit/test_tld.dat" dns = { nameserver = "8.8.8.8" } |