From edf7c7749c4cfb34e622362ab972a799af1fd2eb Mon Sep 17 00:00:00 2001 From: Augustin Cavalier Date: Thu, 5 Dec 2024 23:25:36 -0500 Subject: [PATCH] tests/kernel: Move a bunch of VM-related tests to the "vm" subdirectory. There's still a number of tests in the root that should be moved to other subdirectories, but this at least gets the VM-related ones into a subdirectory (and removes a stale entry in the VM Jamfile.) --- src/tests/system/kernel/Jamfile | 14 ------------ src/tests/system/kernel/vm/Jamfile | 22 ++++++++----------- .../kernel/{ => vm}/cow_bug113_test.cpp | 0 .../system/kernel/{ => vm}/mlock_test.cpp | 0 .../system/kernel/{ => vm}/mmap_cut_tests.cpp | 0 .../kernel/{ => vm}/mmap_fixed_test.cpp | 0 .../kernel/{ => vm}/mmap_resize_test.cpp | 0 .../{ => vm}/page_fault_cache_merge_test.cpp | 0 .../kernel/{ => vm}/reserved_areas_test.cpp | 0 .../{ => vm}/set_area_protection_test1.cpp | 0 .../kernel/{ => vm}/transfer_area_test.cpp | 0 11 files changed, 9 insertions(+), 27 deletions(-) rename src/tests/system/kernel/{ => vm}/cow_bug113_test.cpp (100%) rename src/tests/system/kernel/{ => vm}/mlock_test.cpp (100%) rename src/tests/system/kernel/{ => vm}/mmap_cut_tests.cpp (100%) rename src/tests/system/kernel/{ => vm}/mmap_fixed_test.cpp (100%) rename src/tests/system/kernel/{ => vm}/mmap_resize_test.cpp (100%) rename src/tests/system/kernel/{ => vm}/page_fault_cache_merge_test.cpp (100%) rename src/tests/system/kernel/{ => vm}/reserved_areas_test.cpp (100%) rename src/tests/system/kernel/{ => vm}/set_area_protection_test1.cpp (100%) rename src/tests/system/kernel/{ => vm}/transfer_area_test.cpp (100%) diff --git a/src/tests/system/kernel/Jamfile b/src/tests/system/kernel/Jamfile index 5c7c7e4303..9db70aa307 100644 --- a/src/tests/system/kernel/Jamfile +++ b/src/tests/system/kernel/Jamfile @@ -5,8 +5,6 @@ UsePrivateHeaders shared ; SimpleTest advisory_locking_test : advisory_locking_test.cpp ; -SimpleTest cow_bug113_test : cow_bug113_test.cpp ; - SimpleTest fibo_load_image : fibo_load_image.cpp ; SimpleTest fibo_fork : fibo_fork.cpp ; SimpleTest fibo_exec : fibo_exec.cpp ; @@ -33,8 +31,6 @@ SimpleTest node_monitor_test : : be ; -SimpleTest page_fault_cache_merge_test : page_fault_cache_merge_test.cpp ; - SimpleTest path_resolution_test : path_resolution_test.cpp ; SimpleTest port_close_test_1 : port_close_test_1.cpp ; @@ -54,14 +50,8 @@ SimpleTest port_wakeup_test_7 : port_wakeup_test_7.cpp ; SimpleTest port_wakeup_test_8 : port_wakeup_test_8.cpp ; SimpleTest port_wakeup_test_9 : port_wakeup_test_9.cpp ; -SimpleTest mmap_resize_test : mmap_resize_test.cpp ; -SimpleTest mmap_cut_tests : mmap_cut_tests.cpp ; -SimpleTest mmap_fixed_test : mmap_fixed_test.cpp ; - SimpleTest null_poll_test : null_poll_test.cpp ; -SimpleTest reserved_areas_test : reserved_areas_test.cpp ; - SimpleTest select_check : select_check.cpp ; SimpleTest select_close_test : select_close_test.cpp ; @@ -74,8 +64,6 @@ SimpleTest syscall_restart_test : syscall_restart_test.cpp SimpleTest syscall_time : syscall_time.cpp ; -SimpleTest transfer_area_test : transfer_area_test.cpp ; - SimpleTest wait_test_1 : wait_test_1.c ; SimpleTest wait_test_2 : wait_test_2.cpp ; SimpleTest wait_test_3 : wait_test_3.cpp ; @@ -87,8 +75,6 @@ SimpleTest yield_test : yield_test.cpp ; SimpleTest sigint_bug113_test : sigint_bug113_test.cpp ; -SimpleTest set_area_protection_test1 : set_area_protection_test1.cpp ; - SimpleTest sigsuspend_test : sigsuspend_test.cpp ; SubInclude HAIKU_TOP src tests system kernel cache ; diff --git a/src/tests/system/kernel/vm/Jamfile b/src/tests/system/kernel/vm/Jamfile index 0bdcc9aa9b..9513ae3b39 100644 --- a/src/tests/system/kernel/vm/Jamfile +++ b/src/tests/system/kernel/vm/Jamfile @@ -1,21 +1,17 @@ SubDir HAIKU_TOP src tests system kernel vm ; -SEARCH_SOURCE += [ FDirName $(HAIKU_TOP) src system kernel vm ] ; -SEARCH_SOURCE += [ FDirName $(HAIKU_TOP) src system kernel fs ] ; - -UsePrivateHeaders [ FDirName kernel util ] ; UsePrivateKernelHeaders ; -UnitTestLib libkernelvmtest.so - : KernelVMTestAddon.cpp - VMGetMountPointTest.cpp +SimpleTest cow_bug113_test : cow_bug113_test.cpp ; - # vm - VMUtils.cpp +SimpleTest page_fault_cache_merge_test : page_fault_cache_merge_test.cpp ; - # fs - KPath.cpp +SimpleTest mmap_resize_test : mmap_resize_test.cpp ; +SimpleTest mmap_cut_tests : mmap_cut_tests.cpp ; +SimpleTest mmap_fixed_test : mmap_fixed_test.cpp ; - : [ TargetLibstdc++ ] -; +SimpleTest reserved_areas_test : reserved_areas_test.cpp ; +SimpleTest transfer_area_test : transfer_area_test.cpp ; + +SimpleTest set_area_protection_test1 : set_area_protection_test1.cpp ; diff --git a/src/tests/system/kernel/cow_bug113_test.cpp b/src/tests/system/kernel/vm/cow_bug113_test.cpp similarity index 100% rename from src/tests/system/kernel/cow_bug113_test.cpp rename to src/tests/system/kernel/vm/cow_bug113_test.cpp diff --git a/src/tests/system/kernel/mlock_test.cpp b/src/tests/system/kernel/vm/mlock_test.cpp similarity index 100% rename from src/tests/system/kernel/mlock_test.cpp rename to src/tests/system/kernel/vm/mlock_test.cpp diff --git a/src/tests/system/kernel/mmap_cut_tests.cpp b/src/tests/system/kernel/vm/mmap_cut_tests.cpp similarity index 100% rename from src/tests/system/kernel/mmap_cut_tests.cpp rename to src/tests/system/kernel/vm/mmap_cut_tests.cpp diff --git a/src/tests/system/kernel/mmap_fixed_test.cpp b/src/tests/system/kernel/vm/mmap_fixed_test.cpp similarity index 100% rename from src/tests/system/kernel/mmap_fixed_test.cpp rename to src/tests/system/kernel/vm/mmap_fixed_test.cpp diff --git a/src/tests/system/kernel/mmap_resize_test.cpp b/src/tests/system/kernel/vm/mmap_resize_test.cpp similarity index 100% rename from src/tests/system/kernel/mmap_resize_test.cpp rename to src/tests/system/kernel/vm/mmap_resize_test.cpp diff --git a/src/tests/system/kernel/page_fault_cache_merge_test.cpp b/src/tests/system/kernel/vm/page_fault_cache_merge_test.cpp similarity index 100% rename from src/tests/system/kernel/page_fault_cache_merge_test.cpp rename to src/tests/system/kernel/vm/page_fault_cache_merge_test.cpp diff --git a/src/tests/system/kernel/reserved_areas_test.cpp b/src/tests/system/kernel/vm/reserved_areas_test.cpp similarity index 100% rename from src/tests/system/kernel/reserved_areas_test.cpp rename to src/tests/system/kernel/vm/reserved_areas_test.cpp diff --git a/src/tests/system/kernel/set_area_protection_test1.cpp b/src/tests/system/kernel/vm/set_area_protection_test1.cpp similarity index 100% rename from src/tests/system/kernel/set_area_protection_test1.cpp rename to src/tests/system/kernel/vm/set_area_protection_test1.cpp diff --git a/src/tests/system/kernel/transfer_area_test.cpp b/src/tests/system/kernel/vm/transfer_area_test.cpp similarity index 100% rename from src/tests/system/kernel/transfer_area_test.cpp rename to src/tests/system/kernel/vm/transfer_area_test.cpp