Skip to content

Commit ee112a8

Browse files
committed
Fixed Cmake - set proper LUA path
Due to cmake syntax we have to set ENVIROMENT in a single set_test_properties definition
1 parent d920af1 commit ee112a8

File tree

1 file changed

+2
-4
lines changed

1 file changed

+2
-4
lines changed

CMakeLists.txt

+2-4
Original file line numberDiff line numberDiff line change
@@ -21,11 +21,9 @@ file(GLOB TEST_LIST ${CMAKE_SOURCE_DIR}/t/*.t)
2121
foreach(TEST ${TEST_LIST})
2222
get_filename_component(TEST_NAME ${TEST} NAME)
2323
add_test (memtx-${TEST_NAME} tarantool ${TEST})
24-
set_tests_properties(memtx-${TEST_NAME} PROPERTIES ENVIRONMENT "${LUA_PATH}")
25-
set_tests_properties(memtx-${TEST_NAME} PROPERTIES ENVIRONMENT "ENGINE=memtx")
24+
set_tests_properties(memtx-${TEST_NAME} PROPERTIES ENVIRONMENT "ENGINE=memtx;${LUA_PATH}")
2625
add_test (vinyl-${TEST_NAME} tarantool ${TEST})
27-
set_tests_properties(vinyl-${TEST_NAME} PROPERTIES ENVIRONMENT "${LUA_PATH}")
28-
set_tests_properties(vinyl-${TEST_NAME} PROPERTIES ENVIRONMENT "ENGINE=vinyl")
26+
set_tests_properties(vinyl-${TEST_NAME} PROPERTIES ENVIRONMENT "ENGINE=vinyl;${LUA_PATH}")
2927
endforeach()
3028

3129
add_custom_target(check

0 commit comments

Comments
 (0)