commit 76afb5cfa7e580e33b90472e362fd9e3b921fa8c
from: Sergey Bronnikov <estetus@gmail.com>
via: Sergey Bronnikov <sergeyb@tarantool.org>
date: Fri Jan 20 10:25:39 2023 UTC

Update cmake for tests

commit - 6df34787f1fb91fd40f23018229b75b0f0a3d764
commit + 76afb5cfa7e580e33b90472e362fd9e3b921fa8c
blob - ba6be8c10afc083c5b067d6db8632d733c695c6a
blob + 75bf65a6163e8f3eb55d5072ada1ddceabf328cf
--- CMakePresets.json
+++ CMakePresets.json
@@ -18,6 +18,10 @@
         "CMAKE_EXPORT_COMPILE_COMMANDS": {
           "type": "BOOL",
           "value": "ON"
+        },
+        "ENABLE_TESTING": {
+          "type": "BOOL",
+          "value": "ON"
         }
       }
     }
blob - 9bacef9992ce90ee1760166dd43855819ddf7db2
blob + f8602cc13d8e8f6045599cacab07fdf4ac7b68ce
--- luzer/CMakeLists.txt
+++ luzer/CMakeLists.txt
@@ -55,35 +55,10 @@ target_link_libraries(custom_mutator PRIVATE ${LUA_LIB
 set_target_properties(custom_mutator PROPERTIES VERSION ${PROJECT_VERSION})
 set_target_properties(custom_mutator PROPERTIES SOVERSION 1)
 
-add_test(
-  NAME luzer_unit_test
-  COMMAND ${LUA_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/tests/test_unit.lua
-  WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
-)
-set_tests_properties(luzer_unit_test PROPERTIES
-  ENVIRONMENT "LUA_CPATH='./${CMAKE_CURRENT_BINARY_DIR}/?.so;'"
-)
+if(ENABLE_TESTING)
+  add_subdirectory(tests)
+endif()
 
-add_test(
-  NAME luzer_e2e_test
-  COMMAND ${LUA_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/tests/test_e2e.lua
-  WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
-)
-set_tests_properties(luzer_e2e_test PROPERTIES
-  ENVIRONMENT "LUA_CPATH='./${CMAKE_CURRENT_BINARY_DIR}/?.so;'"
-  PASS_REGULAR_EXPRESSION "test_e2e.lua:9: assertion failed"
-)
-
-add_test(
-  NAME luzer_options_test
-  COMMAND ${LUA_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/tests/test_options.lua
-  WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
-)
-set_tests_properties(luzer_options_test PROPERTIES
-  ENVIRONMENT "LUA_CPATH='./${CMAKE_CURRENT_BINARY_DIR}/?.so;'"
-  PASS_REGULAR_EXPRESSION "ERROR: The required directory \"undefined\" does not exist"
-)
-
 install(
   TARGETS ${PROJECT_NAME}
   LIBRARY
blob - fd7a44be3eada5cc6f27e119bdabe5c3b1ebb22e
blob + 370ce2ea2df2ba7284a09dc1df8db30e3271611f
--- luzer/tests/test_e2e.lua
+++ luzer/tests/test_e2e.lua
@@ -1,5 +1,3 @@
-package.cpath = "./?.so"
-
 local luzer = require("luzer")
 
 local function TestOneInput(buf)
blob - c81d0ea94c5c2db1734ec1c8cce6961e1826559c
blob + c6b81656386b76e4e03bdd3539f93333b807d054
--- luzer/tests/test_options.lua
+++ luzer/tests/test_options.lua
@@ -1,5 +1,3 @@
-package.cpath = "./?.so"
-
 local luzer = require("luzer")
 
 local args = {
blob - e93cc5b807c78ad02cc2ed3ec3e99d446fdef679
blob + 72ec54fdfa8eb59a7b3b9daff7fe676e551b7f3c
--- luzer/tests/test_unit.lua
+++ luzer/tests/test_unit.lua
@@ -1,5 +1,3 @@
-package.cpath = "./?.so"
-
 local luzer = require("luzer")
 
 local function trace(_, line)