From f17ec1661ca74d1e00a760c0e25b51ecb8bd88d8 Mon Sep 17 00:00:00 2001 From: Ryan Houdek Date: Thu, 10 Dec 2020 02:00:13 -0800 Subject: [PATCH] Removes -U option from POSIX unit test runner Option no longer exists. mlockall POSIX test now works since it doesn't try to make 64GB of memory resident in RAM --- unittests/POSIX/CMakeLists.txt | 8 ++++---- unittests/POSIX/Known_Failures | 1 - 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/unittests/POSIX/CMakeLists.txt b/unittests/POSIX/CMakeLists.txt index 511a1fbd0..7e00e5e83 100644 --- a/unittests/POSIX/CMakeLists.txt +++ b/unittests/POSIX/CMakeLists.txt @@ -2,7 +2,7 @@ # Careful. Globbing can't see changes to the contents of files # Need to do a fresh clean to see changes file(GLOB_RECURSE POSIX_TESTS CONFIGURE_DEPENDS ${CMAKE_SOURCE_DIR}/External/fex-posixtest-bins/conformance/*.test) - + foreach(POSIX_TEST ${POSIX_TESTS}) string(REPLACE "/fex-posixtest-bins/" ";" TEST_NAME_LIST ${POSIX_TEST}) @@ -16,9 +16,9 @@ foreach(POSIX_TEST ${POSIX_TESTS}) "${CMAKE_SOURCE_DIR}/unittests/POSIX/Disabled_Tests" "${TEST_NAME}" "${CMAKE_BINARY_DIR}/Bin/FEXLoader" - "-U" "-c" "irint" "-n" "500" "-R" $ENV{ROOTFS} "--" + "-c" "irint" "-n" "500" "-R" $ENV{ROOTFS} "--" "${POSIX_TEST}") - + add_test(NAME "${TEST_NAME}.jit.posix" COMMAND "python3" "${CMAKE_SOURCE_DIR}/Scripts/posix_test_runner.py" "${CMAKE_SOURCE_DIR}/unittests/POSIX/Known_Failures" @@ -26,7 +26,7 @@ foreach(POSIX_TEST ${POSIX_TESTS}) "${CMAKE_SOURCE_DIR}/unittests/POSIX/Disabled_Tests" "${TEST_NAME}" "${CMAKE_BINARY_DIR}/Bin/FEXLoader" - "-U" "-c" "irjit" "-n" "500" "-R" $ENV{ROOTFS} "--" + "-c" "irjit" "-n" "500" "-R" $ENV{ROOTFS} "--" "${POSIX_TEST}") diff --git a/unittests/POSIX/Known_Failures b/unittests/POSIX/Known_Failures index 120a41bb3..ab799eb44 100644 --- a/unittests/POSIX/Known_Failures +++ b/unittests/POSIX/Known_Failures @@ -2,7 +2,6 @@ conformance-interfaces-clock-1-1.test conformance-interfaces-clock_getcpuclockid-2-1.test conformance-interfaces-clock_nanosleep-11-1.test conformance-interfaces-clock_nanosleep-13-1.test -conformance-interfaces-mlockall-8-1.test conformance-interfaces-munmap-2-1.test conformance-interfaces-nanosleep-10000-1.test conformance-interfaces-nanosleep-5-1.test