diff --git a/static-build/cmake/AddTests.cmake b/static-build/cmake/AddTests.cmake index 14abb975d2a284b9f9436572b991f4256b41e952..90602c8c09687bbc137f0c911b361aa01311606a 100644 --- a/static-build/cmake/AddTests.cmake +++ b/static-build/cmake/AddTests.cmake @@ -6,21 +6,3 @@ add_test( -D FILE=${TARANTOOL_BINARY} -P ${CMAKE_CURRENT_LIST_DIR}/CheckDependencies.cmake ) - -add_test( - NAME check-exports - COMMAND ${TARANTOOL_BINARY} - ${CMAKE_CURRENT_LIST_DIR}/../test/exports.test.lua -) - -add_test( - NAME check-traceback - COMMAND ${TARANTOOL_BINARY} - ${CMAKE_CURRENT_LIST_DIR}/../test/traceback.test.lua -) - -add_test( - NAME check-luarocks - COMMAND ${TARANTOOL_BINARY} - ${CMAKE_CURRENT_LIST_DIR}/../test/luarocks.test.lua -) diff --git a/static-build/test/exports.test.lua b/test/app-tap/exports.test.lua similarity index 100% rename from static-build/test/exports.test.lua rename to test/app-tap/exports.test.lua diff --git a/static-build/test/luarocks.test.lua b/test/app-tap/luarocks.test.lua similarity index 88% rename from static-build/test/luarocks.test.lua rename to test/app-tap/luarocks.test.lua index 303e679d148699fb151e0699023d79c7d2c040b9..02fdf601266adefc2ef9568fd3d33f35e9036ddc 100755 --- a/static-build/test/luarocks.test.lua +++ b/test/app-tap/luarocks.test.lua @@ -1,8 +1,16 @@ #!/usr/bin/env tarantool local tap = require('tap') +local tarantool = require('tarantool') + local test = tap.test('embedded-luarocks') +if tarantool.build.linking == 'dynamic' then + test:plan(1) + test:skip('luarocks is not embedded in dynamic build') + os.exit(0) +end + test:plan(3) local function find_luarocks_modules(tbl) diff --git a/static-build/test/traceback.test.lua b/test/app-tap/traceback.test.lua similarity index 56% rename from static-build/test/traceback.test.lua rename to test/app-tap/traceback.test.lua index 32e1ed8b5b0992f2f2af6bbcc5acf1eaa5d208a1..87a51fb23eae2a068637257b74e721836f7d8a9e 100755 --- a/static-build/test/traceback.test.lua +++ b/test/app-tap/traceback.test.lua @@ -1,9 +1,19 @@ #!/usr/bin/env tarantool local tap = require('tap') +local tarantool = require('tarantool') local fiber = require('fiber') local test = tap.test('traceback') + +local _, _, enable_bt = string.find(tarantool.build.options, + '-DENABLE_BACKTRACE=(%a+)') +if enable_bt == 'FALSE' then + test:plan(1) + test:skip('backtrace is disabled') + os.exit(0) +end + test:plan(1) local info = fiber.info()[fiber.id()]