From f91b5cb2974402711461e10ab37efc85343af6dd Mon Sep 17 00:00:00 2001 From: Augustin Cavalier Date: Fri, 31 May 2024 00:40:32 -0400 Subject: [PATCH] tests/file_systems: Move some tests to a common "shared" directory. Rather than having individual directories for the tests. No functional change intended. Change-Id: Ie453eab2d7347cef4ea68a1e7793d01817e7da39 Reviewed-on: https://review.haiku-os.org/c/haiku/+/7706 Tested-by: Commit checker robot Reviewed-by: waddlesplash --- src/tests/add-ons/kernel/file_systems/Jamfile | 5 +---- .../kernel/file_systems/fragmenter/Jamfile | 5 ----- .../file_systems/random_file_actions/Jamfile | 6 ------ .../kernel/file_systems/random_read/Jamfile | 5 ----- .../add-ons/kernel/file_systems/shared/Jamfile | 17 +++++++++++++++++ .../consistency_check/AdaptiveBuffering.cpp | 0 .../consistency_check/AdaptiveBuffering.h | 0 .../{ => shared}/consistency_check/Jamfile | 4 ++-- .../consistency_check/consistency_check.cpp | 0 .../consistency_check/generate_hashs.cpp | 0 .../{fragmenter => shared}/fragmenter.cpp | 0 .../random_file_actions.cpp | 0 .../{random_read => shared}/random_read.cpp | 0 13 files changed, 20 insertions(+), 22 deletions(-) delete mode 100644 src/tests/add-ons/kernel/file_systems/fragmenter/Jamfile delete mode 100644 src/tests/add-ons/kernel/file_systems/random_file_actions/Jamfile delete mode 100644 src/tests/add-ons/kernel/file_systems/random_read/Jamfile create mode 100644 src/tests/add-ons/kernel/file_systems/shared/Jamfile rename src/tests/add-ons/kernel/file_systems/{ => shared}/consistency_check/AdaptiveBuffering.cpp (100%) rename src/tests/add-ons/kernel/file_systems/{ => shared}/consistency_check/AdaptiveBuffering.h (100%) rename src/tests/add-ons/kernel/file_systems/{ => shared}/consistency_check/Jamfile (65%) rename src/tests/add-ons/kernel/file_systems/{ => shared}/consistency_check/consistency_check.cpp (100%) rename src/tests/add-ons/kernel/file_systems/{ => shared}/consistency_check/generate_hashs.cpp (100%) rename src/tests/add-ons/kernel/file_systems/{fragmenter => shared}/fragmenter.cpp (100%) rename src/tests/add-ons/kernel/file_systems/{random_file_actions => shared}/random_file_actions.cpp (100%) rename src/tests/add-ons/kernel/file_systems/{random_read => shared}/random_read.cpp (100%) diff --git a/src/tests/add-ons/kernel/file_systems/Jamfile b/src/tests/add-ons/kernel/file_systems/Jamfile index e4f07a758b..605f4ffcab 100644 --- a/src/tests/add-ons/kernel/file_systems/Jamfile +++ b/src/tests/add-ons/kernel/file_systems/Jamfile @@ -3,11 +3,8 @@ SubDir HAIKU_TOP src tests add-ons kernel file_systems ; HaikuSubInclude bfs ; HaikuSubInclude btrfs ; HaikuSubInclude cdda ; -HaikuSubInclude consistency_check ; -HaikuSubInclude fragmenter ; HaikuSubInclude iso9660 ; -HaikuSubInclude random_file_actions ; -HaikuSubInclude random_read ; +HaikuSubInclude shared ; HaikuSubInclude udf ; HaikuSubInclude ufs2 ; HaikuSubInclude userlandfs ; diff --git a/src/tests/add-ons/kernel/file_systems/fragmenter/Jamfile b/src/tests/add-ons/kernel/file_systems/fragmenter/Jamfile deleted file mode 100644 index 7e76204e8c..0000000000 --- a/src/tests/add-ons/kernel/file_systems/fragmenter/Jamfile +++ /dev/null @@ -1,5 +0,0 @@ -SubDir HAIKU_TOP src tests add-ons kernel file_systems fragmenter ; - -BinCommand fragmenter : - fragmenter.cpp -; diff --git a/src/tests/add-ons/kernel/file_systems/random_file_actions/Jamfile b/src/tests/add-ons/kernel/file_systems/random_file_actions/Jamfile deleted file mode 100644 index 00c1f19a06..0000000000 --- a/src/tests/add-ons/kernel/file_systems/random_file_actions/Jamfile +++ /dev/null @@ -1,6 +0,0 @@ -SubDir HAIKU_TOP src tests add-ons kernel file_systems random_file_actions ; - -SimpleTest random_file_actions - : random_file_actions.cpp - : [ TargetLibstdc++ ] -; diff --git a/src/tests/add-ons/kernel/file_systems/random_read/Jamfile b/src/tests/add-ons/kernel/file_systems/random_read/Jamfile deleted file mode 100644 index 62d8cf672d..0000000000 --- a/src/tests/add-ons/kernel/file_systems/random_read/Jamfile +++ /dev/null @@ -1,5 +0,0 @@ -SubDir HAIKU_TOP src tests add-ons kernel file_systems random_read ; - -SimpleTest random_read - : random_read.cpp - : be ; diff --git a/src/tests/add-ons/kernel/file_systems/shared/Jamfile b/src/tests/add-ons/kernel/file_systems/shared/Jamfile new file mode 100644 index 0000000000..05fe185d48 --- /dev/null +++ b/src/tests/add-ons/kernel/file_systems/shared/Jamfile @@ -0,0 +1,17 @@ +SubDir HAIKU_TOP src tests add-ons kernel file_systems shared ; + +SimpleTest random_file_actions + : random_file_actions.cpp + : [ TargetLibstdc++ ] +; + +SimpleTest random_read + : random_read.cpp + : be +; + +BinCommand fragmenter : + fragmenter.cpp +; + +HaikuSubInclude consistency_check ; diff --git a/src/tests/add-ons/kernel/file_systems/consistency_check/AdaptiveBuffering.cpp b/src/tests/add-ons/kernel/file_systems/shared/consistency_check/AdaptiveBuffering.cpp similarity index 100% rename from src/tests/add-ons/kernel/file_systems/consistency_check/AdaptiveBuffering.cpp rename to src/tests/add-ons/kernel/file_systems/shared/consistency_check/AdaptiveBuffering.cpp diff --git a/src/tests/add-ons/kernel/file_systems/consistency_check/AdaptiveBuffering.h b/src/tests/add-ons/kernel/file_systems/shared/consistency_check/AdaptiveBuffering.h similarity index 100% rename from src/tests/add-ons/kernel/file_systems/consistency_check/AdaptiveBuffering.h rename to src/tests/add-ons/kernel/file_systems/shared/consistency_check/AdaptiveBuffering.h diff --git a/src/tests/add-ons/kernel/file_systems/consistency_check/Jamfile b/src/tests/add-ons/kernel/file_systems/shared/consistency_check/Jamfile similarity index 65% rename from src/tests/add-ons/kernel/file_systems/consistency_check/Jamfile rename to src/tests/add-ons/kernel/file_systems/shared/consistency_check/Jamfile index af26aec061..d75f4c1dca 100644 --- a/src/tests/add-ons/kernel/file_systems/consistency_check/Jamfile +++ b/src/tests/add-ons/kernel/file_systems/shared/consistency_check/Jamfile @@ -1,6 +1,6 @@ -SubDir HAIKU_TOP src tests add-ons kernel file_systems consistency_check ; +SubDir HAIKU_TOP src tests add-ons kernel file_systems shared consistency_check ; -UsePrivateHeaders shared ; +UsePrivateHeaders shared libroot ; SimpleTest generate_hashs : generate_hashs.cpp diff --git a/src/tests/add-ons/kernel/file_systems/consistency_check/consistency_check.cpp b/src/tests/add-ons/kernel/file_systems/shared/consistency_check/consistency_check.cpp similarity index 100% rename from src/tests/add-ons/kernel/file_systems/consistency_check/consistency_check.cpp rename to src/tests/add-ons/kernel/file_systems/shared/consistency_check/consistency_check.cpp diff --git a/src/tests/add-ons/kernel/file_systems/consistency_check/generate_hashs.cpp b/src/tests/add-ons/kernel/file_systems/shared/consistency_check/generate_hashs.cpp similarity index 100% rename from src/tests/add-ons/kernel/file_systems/consistency_check/generate_hashs.cpp rename to src/tests/add-ons/kernel/file_systems/shared/consistency_check/generate_hashs.cpp diff --git a/src/tests/add-ons/kernel/file_systems/fragmenter/fragmenter.cpp b/src/tests/add-ons/kernel/file_systems/shared/fragmenter.cpp similarity index 100% rename from src/tests/add-ons/kernel/file_systems/fragmenter/fragmenter.cpp rename to src/tests/add-ons/kernel/file_systems/shared/fragmenter.cpp diff --git a/src/tests/add-ons/kernel/file_systems/random_file_actions/random_file_actions.cpp b/src/tests/add-ons/kernel/file_systems/shared/random_file_actions.cpp similarity index 100% rename from src/tests/add-ons/kernel/file_systems/random_file_actions/random_file_actions.cpp rename to src/tests/add-ons/kernel/file_systems/shared/random_file_actions.cpp diff --git a/src/tests/add-ons/kernel/file_systems/random_read/random_read.cpp b/src/tests/add-ons/kernel/file_systems/shared/random_read.cpp similarity index 100% rename from src/tests/add-ons/kernel/file_systems/random_read/random_read.cpp rename to src/tests/add-ons/kernel/file_systems/shared/random_read.cpp