From ee112a8d4c622956fe6d470773b3f92dc59d40b7 Mon Sep 17 00:00:00 2001 From: Arseniy Antonov Date: Thu, 19 Apr 2018 14:18:04 +0300 Subject: [PATCH] Fixed Cmake - set proper LUA path Due to cmake syntax we have to set ENVIROMENT in a single set_test_properties definition --- CMakeLists.txt | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index f9b24a8..613e7ac 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -21,11 +21,9 @@ file(GLOB TEST_LIST ${CMAKE_SOURCE_DIR}/t/*.t) foreach(TEST ${TEST_LIST}) get_filename_component(TEST_NAME ${TEST} NAME) add_test (memtx-${TEST_NAME} tarantool ${TEST}) - set_tests_properties(memtx-${TEST_NAME} PROPERTIES ENVIRONMENT "${LUA_PATH}") - set_tests_properties(memtx-${TEST_NAME} PROPERTIES ENVIRONMENT "ENGINE=memtx") + set_tests_properties(memtx-${TEST_NAME} PROPERTIES ENVIRONMENT "ENGINE=memtx;${LUA_PATH}") add_test (vinyl-${TEST_NAME} tarantool ${TEST}) - set_tests_properties(vinyl-${TEST_NAME} PROPERTIES ENVIRONMENT "${LUA_PATH}") - set_tests_properties(vinyl-${TEST_NAME} PROPERTIES ENVIRONMENT "ENGINE=vinyl") + set_tests_properties(vinyl-${TEST_NAME} PROPERTIES ENVIRONMENT "ENGINE=vinyl;${LUA_PATH}") endforeach() add_custom_target(check