cd49708 · opencog-cogserver

Changed files (5) +30 -0

tests/cython/CMakeLists.txt +6 -0

…	…	@@ -13,6 +13,11 @@ TARGET_LINK_LIBRARIES(PyEvalUTest
13	13	${COGUTIL_LIBRARY}
14	14	)
15	15
	16	# Set COGSERVER_MODULE_PATH so modules can be found in the build directory
	17	SET(COGSERVER_TEST_MODULE_PATH
	18	"COGSERVER_MODULE_PATH=${PROJECT_BINARY_DIR}/opencog/cogserver/modules:${PROJECT_BINARY_DIR}/opencog/cogserver/shell")
	19	SET_PROPERTY(TEST PyEvalUTest APPEND PROPERTY ENVIRONMENT ${COGSERVER_TEST_MODULE_PATH})
	20
16	21	# --------------------------
17	22
18	23	ADD_TEST(NAME CogServerPythonTest
…	…	@@ -24,6 +29,7 @@ SET_PROPERTY(TEST CogServerPythonTest
24	29	PROPERTY ENVIRONMENT
25	30	"PYTHONPATH=${CMAKE_BINARY_DIR}/opencog/cython:${PYTHON_ROOT}:$ENV{PYTHONPATH}"
26	31	"LD_LIBRARY_PATH=${CMAKE_BINARY_DIR}/opencog/cogserver/server:${CMAKE_BINARY_DIR}/opencog/cython/opencog:$ENV{LD_LIBRARY_PATH}"
	32	${COGSERVER_TEST_MODULE_PATH}
27	33	)
28	34
29	35	# Mark test to run after the cogserver_cython target is built

tests/http/CMakeLists.txt +6 -0

…	…	@@ -8,3 +8,9 @@ LINK_LIBRARIES(
8	8
9	9	ADD_CXXTEST(HttpUTest)
10	10	ADD_CXXTEST(WebSocketUTest)
	11
	12	# Set COGSERVER_MODULE_PATH so modules can be found in the build directory
	13	SET(COGSERVER_TEST_MODULE_PATH
	14	"COGSERVER_MODULE_PATH=${PROJECT_BINARY_DIR}/opencog/cogserver/modules:${PROJECT_BINARY_DIR}/opencog/cogserver/shell")
	15	SET_PROPERTY(TEST HttpUTest APPEND PROPERTY ENVIRONMENT ${COGSERVER_TEST_MODULE_PATH})
	16	SET_PROPERTY(TEST WebSocketUTest APPEND PROPERTY ENVIRONMENT ${COGSERVER_TEST_MODULE_PATH})

tests/mcp/CMakeLists.txt +4 -0

…	…	@@ -12,3 +12,7 @@ LINK_LIBRARIES(
12	12	)
13	13
14	14	ADD_CXXTEST(MCPUTest)
	15
	16	# Set COGSERVER_MODULE_PATH so modules can be found in the build directory
	17	SET_PROPERTY(TEST MCPUTest APPEND PROPERTY ENVIRONMENT
	18	"COGSERVER_MODULE_PATH=${PROJECT_BINARY_DIR}/opencog/cogserver/modules:${PROJECT_BINARY_DIR}/opencog/cogserver/shell")

tests/scm/CMakeLists.txt +4 -0

…	…	@@ -1,4 +1,8 @@
1	1
2	2	IF (HAVE_GUILE)
3	3	ADD_GUILE_TEST(CogServerTest cog-server-test.scm)
	4
	5	# Set COGSERVER_MODULE_PATH so modules can be found in the build directory
	6	SET_PROPERTY(TEST CogServerTest APPEND PROPERTY ENVIRONMENT
	7	"COGSERVER_MODULE_PATH=${PROJECT_BINARY_DIR}/opencog/cogserver/modules:${PROJECT_BINARY_DIR}/opencog/cogserver/shell")
4	8	ENDIF (HAVE_GUILE)

tests/shell/CMakeLists.txt +10 -0

…	…	@@ -26,3 +26,13 @@ ENDIF (HAVE_MCP)
26	26
27	27	ADD_CXXTEST(IPv6UTest)
28	28	ADD_CXXTEST(ShellUTest)
	29
	30	# Set COGSERVER_MODULE_PATH so modules can be found in the build directory
	31	SET(COGSERVER_TEST_MODULE_PATH
	32	"COGSERVER_MODULE_PATH=${PROJECT_BINARY_DIR}/opencog/cogserver/modules:${PROJECT_BINARY_DIR}/opencog/cogserver/shell")
	33	SET_PROPERTY(TEST JsonShellUTest APPEND PROPERTY ENVIRONMENT ${COGSERVER_TEST_MODULE_PATH})
	34	SET_PROPERTY(TEST IPv6UTest APPEND PROPERTY ENVIRONMENT ${COGSERVER_TEST_MODULE_PATH})
	35	SET_PROPERTY(TEST ShellUTest APPEND PROPERTY ENVIRONMENT ${COGSERVER_TEST_MODULE_PATH})
	36	IF (HAVE_MCP)
	37	SET_PROPERTY(TEST McpShellUTest APPEND PROPERTY ENVIRONMENT ${COGSERVER_TEST_MODULE_PATH})
	38	ENDIF (HAVE_MCP)