From dd703af60a9c0a1b8352a861102351edd16c1ffb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Duval?= Date: Wed, 30 Mar 2005 21:42:51 +0000 Subject: [PATCH] moved bin into tests, fixed build git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@12168 a95241bf-73f2-0310-859d-f6bbb57e9c96 --- src/tests/Jamfile | 1 + src/tests/apps/Jamfile | 3 +-- src/tests/apps/bin/Jamfile | 3 --- src/tests/bin/Jamfile | 3 +++ src/tests/{apps => }/bin/makeudfimage/AllocatorTest.cpp | 0 src/tests/{apps => }/bin/makeudfimage/AllocatorTest.h | 0 src/tests/{apps => }/bin/makeudfimage/Jamfile | 6 +++--- .../{apps => }/bin/makeudfimage/MakeudfimageTestAddon.cpp | 0 8 files changed, 8 insertions(+), 8 deletions(-) delete mode 100644 src/tests/apps/bin/Jamfile create mode 100644 src/tests/bin/Jamfile rename src/tests/{apps => }/bin/makeudfimage/AllocatorTest.cpp (100%) rename src/tests/{apps => }/bin/makeudfimage/AllocatorTest.h (100%) rename src/tests/{apps => }/bin/makeudfimage/Jamfile (81%) rename src/tests/{apps => }/bin/makeudfimage/MakeudfimageTestAddon.cpp (100%) diff --git a/src/tests/Jamfile b/src/tests/Jamfile index 0338fe67c1..685eb505dd 100644 --- a/src/tests/Jamfile +++ b/src/tests/Jamfile @@ -35,6 +35,7 @@ R5UnitTest UnitTesterHelper SubInclude OBOS_TOP src tests add-ons ; SubInclude OBOS_TOP src tests apps ; +SubInclude OBOS_TOP src tests bin ; SubInclude OBOS_TOP src tests kernel ; SubInclude OBOS_TOP src tests kits ; SubInclude OBOS_TOP src tests servers ; diff --git a/src/tests/apps/Jamfile b/src/tests/apps/Jamfile index 841445e488..0e966d5311 100644 --- a/src/tests/apps/Jamfile +++ b/src/tests/apps/Jamfile @@ -1,4 +1,3 @@ SubDir OBOS_TOP src tests apps ; -SubInclude OBOS_TOP src tests apps bin ; -SubInclude OBOS_TOP src tests apps miniterminal ; \ No newline at end of file +SubInclude OBOS_TOP src tests apps miniterminal ; diff --git a/src/tests/apps/bin/Jamfile b/src/tests/apps/bin/Jamfile deleted file mode 100644 index 308cee60a6..0000000000 --- a/src/tests/apps/bin/Jamfile +++ /dev/null @@ -1,3 +0,0 @@ -SubDir OBOS_TOP src tests apps bin ; - -SubInclude OBOS_TOP src tests apps bin makeudfimage ; diff --git a/src/tests/bin/Jamfile b/src/tests/bin/Jamfile new file mode 100644 index 0000000000..5b0b692f25 --- /dev/null +++ b/src/tests/bin/Jamfile @@ -0,0 +1,3 @@ +SubDir OBOS_TOP src tests bin ; + +SubInclude OBOS_TOP src tests bin makeudfimage ; diff --git a/src/tests/apps/bin/makeudfimage/AllocatorTest.cpp b/src/tests/bin/makeudfimage/AllocatorTest.cpp similarity index 100% rename from src/tests/apps/bin/makeudfimage/AllocatorTest.cpp rename to src/tests/bin/makeudfimage/AllocatorTest.cpp diff --git a/src/tests/apps/bin/makeudfimage/AllocatorTest.h b/src/tests/bin/makeudfimage/AllocatorTest.h similarity index 100% rename from src/tests/apps/bin/makeudfimage/AllocatorTest.h rename to src/tests/bin/makeudfimage/AllocatorTest.h diff --git a/src/tests/apps/bin/makeudfimage/Jamfile b/src/tests/bin/makeudfimage/Jamfile similarity index 81% rename from src/tests/apps/bin/makeudfimage/Jamfile rename to src/tests/bin/makeudfimage/Jamfile index 61f733b1f3..38ffeaf64f 100644 --- a/src/tests/apps/bin/makeudfimage/Jamfile +++ b/src/tests/bin/makeudfimage/Jamfile @@ -1,8 +1,8 @@ -SubDir OBOS_TOP src tests apps bin makeudfimage ; +SubDir OBOS_TOP src tests bin makeudfimage ; UsePrivateHeaders [ FDirName kernel util ] ; # For kernel_cpp.h SubDirHdrs [ FDirName $(OBOS_TOP) src add-ons kernel file_systems udf ] ; -SubDirHdrs [ FDirName $(OBOS_TOP) src apps bin makeudfimage ] ; +SubDirHdrs [ FDirName $(OBOS_TOP) src bin makeudfimage ] ; TestLib libmakeudfimagetest.so : MakeudfimageTestAddon.cpp @@ -25,6 +25,6 @@ TestLib libmakeudfimagetest.so ; SEARCH on [ FGristFiles Allocator.cpp PhysicalPartitionAllocator.cpp ] - = [ FDirName $(OBOS_TOP) src apps bin makeudfimage ] ; + = [ FDirName $(OBOS_TOP) src bin makeudfimage ] ; SEARCH on [ FGristFiles UdfDebug.cpp UdfString.cpp UdfStructures.cpp Utils.cpp ] #DString.cpp UdfDebug.cpp UdfString.cpp UdfStructures.cpp Utils.cpp ] = [ FDirName $(OBOS_TOP) src add-ons kernel file_systems udf ] ; diff --git a/src/tests/apps/bin/makeudfimage/MakeudfimageTestAddon.cpp b/src/tests/bin/makeudfimage/MakeudfimageTestAddon.cpp similarity index 100% rename from src/tests/apps/bin/makeudfimage/MakeudfimageTestAddon.cpp rename to src/tests/bin/makeudfimage/MakeudfimageTestAddon.cpp