From: Vsevolod Stakhov <vsevolod@highsecure.ru>
Date: Wed, 29 Jun 2016 13:55:25 +0000 (+0100)
Subject: [Fix] Fix build with the new tests framework
X-Git-Tag: 1.3.0~217
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=301aeb573abdcb237ab59d6f2c08ba069c0dff5a;p=rspamd.git

[Fix] Fix build with the new tests framework
---

diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
index e94a1a04b..f32d772b9 100644
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -40,14 +40,6 @@ IF (ENABLE_HYPERSCAN MATCHES "ON")
 ENDIF()
 TARGET_LINK_LIBRARIES(rspamd-test rspamd-actrie)
 
-ADD_CUSTOM_TARGET(rspamd-func-test COMMAND 
-		"/bin/sh"
-		"${CMAKE_CURRENT_BINARY_DIR}/functional/tests.sh")
-		
-ADD_DEPENDENCIES(rspamd-func-test rspamd-test)
-ADD_DEPENDENCIES(rspamd-func-test rspamc)
-ADD_DEPENDENCIES(rspamd-func-test rspamd)
-
 IF(NOT "${CMAKE_CURRENT_SOURCE_DIR}" STREQUAL "${CMAKE_CURRENT_BINARY_DIR}")
 	# Also add dependencies for convenience
 	FILE(GLOB_RECURSE LUA_TESTS "${CMAKE_CURRENT_SOURCE_DIR}/lua/*")
@@ -68,24 +60,4 @@ IF(NOT "${CMAKE_CURRENT_SOURCE_DIR}" STREQUAL "${CMAKE_CURRENT_BINARY_DIR}")
 		)
 		ADD_DEPENDENCIES(rspamd-test "${_NM}")
 	ENDFOREACH()
-	
-	ADD_CUSTOM_TARGET(functional-dir COMMAND
-		${CMAKE_COMMAND} -E make_directory "${CMAKE_CURRENT_BINARY_DIR}/functional/cases"
-		COMMAND ${CMAKE_COMMAND} -E make_directory 
-		"${CMAKE_CURRENT_BINARY_DIR}/functional/configs" 
-		COMMAND ${CMAKE_COMMAND} -E make_directory 
-		"${CMAKE_CURRENT_BINARY_DIR}/functional/messages"
-	)
-	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)
-		STRING(REPLACE "${CMAKE_CURRENT_SOURCE_DIR}" "${CMAKE_CURRENT_BINARY_DIR}"
-			_DS "${_LF}")
-		ADD_CUSTOM_TARGET("${_NM}" COMMAND
-			${CMAKE_COMMAND} -E copy_if_different ${_LF} ${_DS}
-			SOURCES "${_LF}"
-		)
-		ADD_DEPENDENCIES(rspamd-func-test "${_NM}")
-	ENDFOREACH()
 ENDIF()
\ No newline at end of file