From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from [87.239.111.99] (localhost [127.0.0.1]) by dev.tarantool.org (Postfix) with ESMTP id 35A95C4F40F; Wed, 14 Aug 2024 16:56:59 +0300 (MSK) DKIM-Filter: OpenDKIM Filter v2.11.0 dev.tarantool.org 35A95C4F40F DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=tarantool.org; s=dev; t=1723643819; bh=2g7RB+FctgN7etMLma/sq1ZPg1exmHWmrtZHbO0zNNc=; h=To:Date:In-Reply-To:References:Subject:List-Id:List-Unsubscribe: List-Archive:List-Post:List-Help:List-Subscribe:From:Reply-To:Cc: From; b=CsAZYi9sqRTuG/R7STy5uN9kUbnL7eleUc3ILzsZNwWE49Y7FAMPQksrUwHNyNGd3 LWcGij5QtuenYWxaGsEggoum9U36tbLF7ew5c1ZxqlMdW/BwpKK0dioWxv0kJ5AH1h hu34onSzncYpdDXm8hSi5VJg7SeLxNAHlHAwG+TM= Received: from smtp45.i.mail.ru (smtp45.i.mail.ru [95.163.41.83]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by dev.tarantool.org (Postfix) with ESMTPS id 094AAC4F40F for ; Wed, 14 Aug 2024 16:56:28 +0300 (MSK) DKIM-Filter: OpenDKIM Filter v2.11.0 dev.tarantool.org 094AAC4F40F Received: by smtp45.i.mail.ru with esmtpa (envelope-from ) id 1seEUE-00000003nAF-3tza; Wed, 14 Aug 2024 16:56:27 +0300 To: Maxim Kokryashkin , Sergey Bronnikov Date: Wed, 14 Aug 2024 16:55:42 +0300 Message-ID: X-Mailer: git-send-email 2.45.2 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Mailru-Src: smtp X-4EC0790: 10 X-7564579A: 78E4E2B564C1792B X-77F55803: 4F1203BC0FB41BD9D7B6E71A78C20FB9F696E38D847E5480E7A54CF9D146B7C9182A05F538085040176D5D87C837BABBA6D5EE0DB6E1EC8DFE46B8E35E510964129B12038A8E527CC1B496903CC57CC2 X-7FA49CB5: FF5795518A3D127A4AD6D5ED66289B5278DA827A17800CE7344E87C2CDB13504EA1F7E6F0F101C67BD4B6F7A4D31EC0BCC500DACC3FED6E28638F802B75D45FF8AA50765F79006370524969314C818398638F802B75D45FF36EB9D2243A4F8B5A6FCA7DBDB1FC311F39EFFDF887939037866D6147AF826D8429543A2AF6B7C6792FDB6FC48C14056CDA5571C3A7D748CCC7F00164DA146DAFE8445B8C89999728AA50765F7900637E603D20A273AEC4F389733CBF5DBD5E9C8A9BA7A39EFB766F5D81C698A659EA7CC7F00164DA146DA9985D098DBDEAEC897AD43380FEE24CAF6B57BC7E6449061A352F6E88A58FB86F5D81C698A659EA73AA81AA40904B5D9A18204E546F3947CDA532D2019E286A703F1AB874ED890284AD6D5ED66289B523666184CF4C3C14F6136E347CC761E07725E5C173C3A84C3BF103EB767CE7D41BA3038C0950A5D36B5C8C57E37DE458B330BD67F2E7D9AF16D1867E19FE14079C09775C1D3CA48CF17B107DEF921CE791DD303D21008E298D5E8D9A59859A8B6D082881546D9349175ECD9A6C639B01B78DA827A17800CE7888FFA144A8AE6D0731C566533BA786AA5CC5B56E945C8DA X-C1DE0DAB: 0D63561A33F958A54D3B26241BE77B935002B1117B3ED696178BC38333D91596250A03108B67251B823CB91A9FED034534781492E4B8EEADEF0AF71940E62277C79554A2A72441328621D336A7BC284946AD531847A6065A535571D14F44ED41 X-C8649E89: 1C3962B70DF3F0ADE00A9FD3E00BEEDF3FED46C3ACD6F73ED3581295AF09D3DF87807E0823442EA2ED31085941D9CD0AF7F820E7B07EA4CF70AB204D3D1797758BE2CE1E2E3E3C1625D668BE3D462245D19A4C286F1FE71B669E50AE97022433470327EB0AC8E693D18A78046BF1AF3EE98BAB6BFF30A478182F74C5827CA455C226CC413062362A913E6812662D5F2A5EAB5682573093F7837F15F2B5E4A70B33F2C28C22F508233FCF178C6DD14203 X-D57D3AED: 3ZO7eAau8CL7WIMRKs4sN3D3tLDjz0dLbV79QFUyzQ2Ujvy7cMT6pYYqY16iZVKkSc3dCLJ7zSJH7+u4VD18S7Vl4ZUrpaVfd2+vE6kuoey4m4VkSEu530nj6fImhcD4MUrOEAnl0W826KZ9Q+tr5ycPtXkTV4k65bRjmOUUP8cvGozZ33TWg5HZplvhhXbhDGzqmQDTd6OAevLeAnq3Ra9uf7zvY2zzsIhlcp/Y7m53TZgf2aB4JOg4gkr2biojnMg09N3zL/ijCFVA28zgnQ== X-Mailru-Sender: 520A125C2F17F0B1A9638AD358559B59AAA5E8B181E7D128A6D5EE0DB6E1EC8DFE46B8E35E510964B7CBEF92542CD7C88B0A2698F12F5C9EC77752E0C033A69E86920BD37369036789A8C6A0E60D2BB63A5DB60FBEB33A8A0DA7A0AF5A3A8387 X-Mras: Ok Subject: [Tarantool-patches] [PATCH luajit 01/36] test: don't run JIT-based LuaJIT tests without JIT X-BeenThere: tarantool-patches@dev.tarantool.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Tarantool development patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , From: Sergey Kaplun via Tarantool-patches Reply-To: Sergey Kaplun Cc: tarantool-patches@dev.tarantool.org Errors-To: tarantool-patches-bounces@dev.tarantool.org Sender: "Tarantool-patches" Before this patch +jit flag is given to the LuaJIT test suite unconditionally even when LuaJIT is built as a pure interpreter. This patch fixes the behaviour by setting the flag only when `LUAJIT_DISABLE_JIT` option is not set. Needed for tarantool/tarantool#9398 --- test/LuaJIT-tests/CMakeLists.txt | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/test/LuaJIT-tests/CMakeLists.txt b/test/LuaJIT-tests/CMakeLists.txt index 9fbe9bf5..019762e0 100644 --- a/test/LuaJIT-tests/CMakeLists.txt +++ b/test/LuaJIT-tests/CMakeLists.txt @@ -42,11 +42,15 @@ if(LUAJIT_USE_ASAN) endif() endif() +if(NOT LUAJIT_DISABLE_JIT) + list(APPEND LUAJIT_TEST_TAGS_EXTRA +jit) +endif() + if(LUAJIT_NO_UNWIND) # Test verifies the interoperability with C++ # ABI exceptions, so it requires external unwinding enabled. # Hence, skip them otherwise. - set(LUAJIT_TEST_TAGS_EXTRA +internal_unwinder) + list(APPEND LUAJIT_TEST_TAGS_EXTRA +internal_unwinder) endif() if(CMAKE_C_FLAGS MATCHES "-march=skylake-avx512") @@ -55,7 +59,7 @@ if(CMAKE_C_FLAGS MATCHES "-march=skylake-avx512") # built with the enabled AVX512 instruction set, see # https://github.com/tarantool/tarantool/issues/6787. # Hence, skip this when "skylake-avx512" is passed. - set(LUAJIT_TEST_TAGS_EXTRA +avx512) + list(APPEND LUAJIT_TEST_TAGS_EXTRA +avx512) endif() set(TEST_SUITE_NAME "LuaJIT-tests") @@ -73,7 +77,7 @@ add_test_suite_target(LuaJIT-tests set(test_title "test/${TEST_SUITE_NAME}") add_test(NAME "${test_title}" COMMAND ${LUAJIT_TEST_COMMAND} ${CMAKE_CURRENT_SOURCE_DIR}/test.lua - +slow +ffi +bit +jit ${LUAJIT_TEST_TAGS_EXTRA} + +slow +ffi +bit ${LUAJIT_TEST_TAGS_EXTRA} WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} ) set_tests_properties("${test_title}" PROPERTIES -- 2.45.2