FEX-Emu/FEX
1
0
Fork 0
mirror of https://github.com/FEX-Emu/FEX.git synced 2025-02-24 16:51:32 +00:00
Code Issues Actions 6 Packages Projects Releases Wiki Activity

Merge pull request #3201 from neobrain/fix_flt_thunks_64bit_only

Browse Source 
FEXLinuxTests: Temporarily limit thunk test execution to 64-bit guests
This commit is contained in:
Ryan Houdek 2023-10-18 12:40:29 +02:00 committed by GitHub
commit 1ea40ae676
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
unittests/FEXLinuxTests/CMakeLists.txt
View File

@ -34,7 +34,7 @@ list(REMOVE_ITEM TESTS ${TESTS_32_ONLY})
function(AddTests Tests BinDirectory Bitness)
foreach(TEST ${Tests})
get_filename_component(TEST_NAME ${TEST} NAME_WLE)
get_filename_component(TEST_NAME ${TEST} NAME_WE)
file(READ ${TEST} TEST_CODE)
@ -93,7 +93,6 @@ AddTests("${TESTS_32_ONLY}" "FEXLinuxTests_32" 32)
if(TEST thunk_testlib.64.jit.flt)
# Ensure libfex_thunk_test is found even when using an uncommon install prefix
set_property(TEST "thunk_testlib.32.jit.flt" PROPERTY ENVIRONMENT "LD_LIBRARY_PATH=${CMAKE_INSTALL_PREFIX}/lib")
set_property(TEST "thunk_testlib.64.jit.flt" PROPERTY ENVIRONMENT "LD_LIBRARY_PATH=${CMAKE_INSTALL_PREFIX}/lib")
endif()

6
unittests/FEXLinuxTests/tests/CMakeLists.txt
View File

@ -22,7 +22,7 @@ set(CATCH_BUILD_STATIC_LIBRARY ON)
add_subdirectory(../../../External/Catch2/ Catch2)
foreach(TEST ${TESTS})
get_filename_component(TEST_NAME ${TEST} NAME_WLE)
get_filename_component(TEST_NAME ${TEST} NAME_WE)
add_executable(${TEST_NAME}.${BITNESS} ${TEST})
target_link_libraries(${TEST_NAME}.${BITNESS} PRIVATE Catch2::Catch2WithMain)
@ -40,6 +40,8 @@ target_link_libraries(smc-shared-1.${BITNESS} PRIVATE rt pthread)
target_link_libraries(smc-shared-2.${BITNESS} PRIVATE rt pthread)
target_link_libraries(thunk_testlib.${BITNESS} PRIVATE ${CMAKE_DL_LIBS})
if(BITNESS EQUAL 64)
target_link_libraries(thunk_testlib.${BITNESS} PRIVATE ${CMAKE_DL_LIBS})
endif()
target_link_libraries(timer-sigev-thread.${BITNESS} PRIVATE rt pthread)

0
unittests/FEXLinuxTests/tests/thunks/thunk_testlib.cpp → unittests/FEXLinuxTests/tests/thunks/thunk_testlib.64.cpp
View File