From: Vsevolod Stakhov <vsevolod@highsecure.ru>
Date: Thu, 9 Jul 2015 13:45:48 +0000 (+0100)
Subject: Adopt build system for new tests.
X-Git-Tag: 1.0.0~405
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=c20631bd67eaf070b8a37d298c627824df33eaff;p=thirdparty%2Frspamd.git

Adopt build system for new tests.
---

diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
index 1bc0a9061a..a133935e6f 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 2ff07ac60f..c1ade3636b 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 a70fc5aed0..709796640e 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 0b706c31c6..9aaa4faab6 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"
 	}