From e3db3bf84ea4934807e4104d20c3c39aeb8fe1df Mon Sep 17 00:00:00 2001
From: Augustin Cavalier <waddlesplash@gmail.com>
Date: Sun, 12 Aug 2018 23:21:14 -0400
Subject: [PATCH] btrfs_shell: Move from src/tools to src/tests/...

src/tools is for tools used in the build or other miscellaneous utilites
that go along with Haiku itself. btrfs is, at least for now, just another
filesystem addon, so its shell should live here with all the others.
No functional change intended.
---
 src/tests/add-ons/kernel/file_systems/Jamfile                  | 1 +
 src/tests/add-ons/kernel/file_systems/btrfs/Jamfile            | 3 +++
 .../add-ons/kernel/file_systems/btrfs}/btrfs_shell/Jamfile     | 3 +--
 .../file_systems/btrfs}/btrfs_shell/additional_commands.cpp    | 0
 .../kernel/file_systems/btrfs}/btrfs_shell/command_cat.cpp     | 0
 .../kernel/file_systems/btrfs}/btrfs_shell/command_cat.h       | 0
 src/tools/Jamfile                                              | 1 -
 7 files changed, 5 insertions(+), 3 deletions(-)
 create mode 100644 src/tests/add-ons/kernel/file_systems/btrfs/Jamfile
 rename src/{tools => tests/add-ons/kernel/file_systems/btrfs}/btrfs_shell/Jamfile (95%)
 rename src/{tools => tests/add-ons/kernel/file_systems/btrfs}/btrfs_shell/additional_commands.cpp (100%)
 rename src/{tools => tests/add-ons/kernel/file_systems/btrfs}/btrfs_shell/command_cat.cpp (100%)
 rename src/{tools => tests/add-ons/kernel/file_systems/btrfs}/btrfs_shell/command_cat.h (100%)

diff --git a/src/tests/add-ons/kernel/file_systems/Jamfile b/src/tests/add-ons/kernel/file_systems/Jamfile
index 65c413aa02..a80375e888 100644
--- a/src/tests/add-ons/kernel/file_systems/Jamfile
+++ b/src/tests/add-ons/kernel/file_systems/Jamfile
@@ -1,6 +1,7 @@
 SubDir HAIKU_TOP src tests add-ons kernel file_systems ;
 
 HaikuSubInclude bfs ;
+HaikuSubInclude btrfs ;
 HaikuSubInclude cdda ;
 HaikuSubInclude consistency_check ;
 HaikuSubInclude fs_shell ;
diff --git a/src/tests/add-ons/kernel/file_systems/btrfs/Jamfile b/src/tests/add-ons/kernel/file_systems/btrfs/Jamfile
new file mode 100644
index 0000000000..15d74f2132
--- /dev/null
+++ b/src/tests/add-ons/kernel/file_systems/btrfs/Jamfile
@@ -0,0 +1,3 @@
+SubDir HAIKU_TOP src tests add-ons kernel file_systems btrfs ;
+
+SubInclude HAIKU_TOP src tests add-ons kernel file_systems btrfs btrfs_shell ;
diff --git a/src/tools/btrfs_shell/Jamfile b/src/tests/add-ons/kernel/file_systems/btrfs/btrfs_shell/Jamfile
similarity index 95%
rename from src/tools/btrfs_shell/Jamfile
rename to src/tests/add-ons/kernel/file_systems/btrfs/btrfs_shell/Jamfile
index 50a69d24d0..ff04a5d017 100644
--- a/src/tools/btrfs_shell/Jamfile
+++ b/src/tests/add-ons/kernel/file_systems/btrfs/btrfs_shell/Jamfile
@@ -1,4 +1,4 @@
-SubDir HAIKU_TOP src tools btrfs_shell ;
+SubDir HAIKU_TOP src tests add-ons kernel file_systems btrfs btrfs_shell ;
 
 SEARCH_SOURCE += [ FDirName $(HAIKU_TOP) src add-ons kernel file_systems btrfs ] ;
 
@@ -8,7 +8,6 @@ DEFINES += HAIKU_BUILD_COMPATIBILITY_H ;
 # set some additional defines
 {
 	local defines =
-		#BTRFS_BIG_ENDIAN_ONLY
 		FS_SHELL
 		TRACE_BTRFS # ENABLE DEBUGGING
 		;
diff --git a/src/tools/btrfs_shell/additional_commands.cpp b/src/tests/add-ons/kernel/file_systems/btrfs/btrfs_shell/additional_commands.cpp
similarity index 100%
rename from src/tools/btrfs_shell/additional_commands.cpp
rename to src/tests/add-ons/kernel/file_systems/btrfs/btrfs_shell/additional_commands.cpp
diff --git a/src/tools/btrfs_shell/command_cat.cpp b/src/tests/add-ons/kernel/file_systems/btrfs/btrfs_shell/command_cat.cpp
similarity index 100%
rename from src/tools/btrfs_shell/command_cat.cpp
rename to src/tests/add-ons/kernel/file_systems/btrfs/btrfs_shell/command_cat.cpp
diff --git a/src/tools/btrfs_shell/command_cat.h b/src/tests/add-ons/kernel/file_systems/btrfs/btrfs_shell/command_cat.h
similarity index 100%
rename from src/tools/btrfs_shell/command_cat.h
rename to src/tests/add-ons/kernel/file_systems/btrfs/btrfs_shell/command_cat.h
diff --git a/src/tools/Jamfile b/src/tools/Jamfile
index 699c7666dd..680646e837 100644
--- a/src/tools/Jamfile
+++ b/src/tools/Jamfile
@@ -88,7 +88,6 @@ SEARCH on [ FGristFiles
 SubInclude HAIKU_TOP src tools addattr ;
 SubInclude HAIKU_TOP src tools anyboot ;
 SubInclude HAIKU_TOP src tools bfs_shell ;
-SubInclude HAIKU_TOP src tools btrfs_shell ;
 SubInclude HAIKU_TOP src tools cppunit ;
 SubInclude HAIKU_TOP src tools create_repository_config ;
 SubInclude HAIKU_TOP src tools elfsymbolpatcher ;