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 C63A8C61993; Wed, 21 Aug 2024 11:59:29 +0300 (MSK) DKIM-Filter: OpenDKIM Filter v2.11.0 dev.tarantool.org C63A8C61993 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=tarantool.org; s=dev; t=1724230769; 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=xp8s+5agPwaG3JbqJRQuC0ZGbs04aGr5cOTdyRoGB7B6bYOhkw8+s7YMClP4QzROe 5a88cHCxVH19XJvfjJXDyQXivTpW/L7rmfVXxhRaiQorDteHgRhe0Txc+v5hpPTGjz 4H3Cra1HBPpn/iI7irW8LPZ0//AZuVF0tXtp4rxU= Received: from smtp35.i.mail.ru (smtp35.i.mail.ru [95.163.41.76]) (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 6FBF3C65F32 for ; Wed, 21 Aug 2024 11:58:59 +0300 (MSK) DKIM-Filter: OpenDKIM Filter v2.11.0 dev.tarantool.org 6FBF3C65F32 Received: by smtp35.i.mail.ru with esmtpa (envelope-from ) id 1sghBC-00000005aRz-1Fpb; Wed, 21 Aug 2024 11:58:58 +0300 To: Maxim Kokryashkin , Sergey Bronnikov Date: Wed, 21 Aug 2024 11:58:04 +0300 Message-ID: <80442fa0dabe4b99b45b6dd86e302b135a52c26f.1724228998.git.skaplun@tarantool.org> 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: 646B95376F6C166E X-77F55803: 4F1203BC0FB41BD93D5A650E6D4F687E9C3FD643FCC13A466318113F8129A21C182A05F5380850403F8419949D5C4F17D27678DDAA806314D8E8DCE63E5B2E67EFF80BD07D1CDB7929FF1465CC0F6BAA X-7FA49CB5: FF5795518A3D127A4AD6D5ED66289B5278DA827A17800CE72A64CB3BE381ABE4EA1F7E6F0F101C67BD4B6F7A4D31EC0BCC500DACC3FED6E28638F802B75D45FF8AA50765F79006373103A56A89D9083FEA1F7E6F0F101C6723150C8DA25C47586E58E00D9D99D84E1BDDB23E98D2D38B043BF0FB74779F364B75589596AF90A4B871019616B657E7FCCD04DC174DC91BA471835C12D1D9774AD6D5ED66289B5278DA827A17800CE709B92020B71E24959FA2833FD35BB23D2EF20D2F80756B5F868A13BD56FB6657A471835C12D1D977725E5C173C3A84C3776A0366D588B3C3117882F4460429728AD0CFFFB425014E868A13BD56FB6657E2021AF6380DFAD1A18204E546F3947C062BEEFFB5F8EA3E2E808ACE2090B5E1725E5C173C3A84C3E478A468B35FE767089D37D7C0E48F6C8AA50765F7900637870CFFD37CCFDD3AEFF80C71ABB335746BA297DBC24807EABDAD6C7F3747799A X-C1DE0DAB: 0D63561A33F958A510314FD983F29C9D5002B1117B3ED696A4CA2EE225F2FC8A361FAC1196A180DE823CB91A9FED034534781492E4B8EEAD2739D626790C8313C79554A2A72441328621D336A7BC284946AD531847A6065A535571D14F44ED41 X-C8649E89: 1C3962B70DF3F0ADE00A9FD3E00BEEDF3FED46C3ACD6F73ED3581295AF09D3DF87807E0823442EA2ED31085941D9CD0AF7F820E7B07EA4CFCA06133CB24E58C599BAB86BDFAEB689CEDA9AE91E60AE860E903035537F6A3D257E6C4F5EEB673ED14E51FF79EEE603F8B4749FFA03ADABB2A94BCD9D7316CE985281A974896000C226CC413062362A913E6812662D5F2A5EAB5682573093F7837F15F2B5E4A70B33F2C28C22F508233FCF178C6DD14203 X-D57D3AED: 3ZO7eAau8CL7WIMRKs4sN3D3tLDjz0dLbV79QFUyzQ2Ujvy7cMT6pYYqY16iZVKkSc3dCLJ7zSJH7+u4VD18S7Vl4ZUrpaVfd2+vE6kuoey4m4VkSEu530nj6fImhcD4MUrOEAnl0W826KZ9Q+tr5ycPtXkTV4k65bRjmOUUP8cvGozZ33TWg5HZplvhhXbhDGzqmQDTd6OAevLeAnq3Ra9uf7zvY2zzsIhlcp/Y7m53TZgf2aB4JOg4gkr2biojegttVMu7AX8GY8L3NTD+ag== X-DA7885C5: 53BFA897D4A68366F255D290C0D534F90A43E09C534A04039DCA75A632B8141632E19CD90038F3A35B1A4C17EAA7BC4BEF2421ABFA55128DAF83EF9164C44C7E X-Mailru-Sender: 689FA8AB762F7393C6D0B12EA33CAA9BFD4E2C02DA75AF50DAC77899D9C4377F289D0F5400C83F29E49D44BB4BD9522A059A1ED8796F048DB274557F927329BE89D5A3BC2B10C37545BD1C3CC395C826B4A721A3011E896F X-Mras: Ok Subject: [Tarantool-patches] [PATCH v2 luajit 01/45] 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