From 7edcb06f629466ff0e4585f23e417705ff005e74 Mon Sep 17 00:00:00 2001 From: Augustin Cavalier Date: Tue, 17 Jul 2018 19:07:42 -0400 Subject: [PATCH] tests/file_systems/bfs: Update tests Jamfiles to refer to the kernel BFS sources. --- .../add-ons/kernel/file_systems/bfs/array/Jamfile | 10 +++++----- .../add-ons/kernel/file_systems/bfs/btree/Jamfile | 2 +- .../add-ons/kernel/file_systems/bfs/bufferPool/Jamfile | 8 ++++---- .../add-ons/kernel/file_systems/bfs/dump_log/Jamfile | 6 +++--- .../add-ons/kernel/file_systems/bfs/queries/Jamfile | 2 +- .../kernel/file_systems/bfs/structureSizes/Jamfile | 7 ++++--- 6 files changed, 18 insertions(+), 17 deletions(-) diff --git a/src/tests/add-ons/kernel/file_systems/bfs/array/Jamfile b/src/tests/add-ons/kernel/file_systems/bfs/array/Jamfile index 459f577977..5083109ad8 100644 --- a/src/tests/add-ons/kernel/file_systems/bfs/array/Jamfile +++ b/src/tests/add-ons/kernel/file_systems/bfs/array/Jamfile @@ -1,7 +1,7 @@ SubDir HAIKU_TOP src tests add-ons kernel file_systems bfs array ; -SubDirHdrs $(HAIKU_TOP) src tests add-ons kernel file_systems bfs r5 ; -UsePrivateHeaders [ FDirName kernel ] ; # For kernel_cpp.cpp +SubDirHdrs $(HAIKU_TOP) src add-ons kernel file_systems bfs ; +UsePrivateKernelHeaders ; { local defines = [ FDefines USER DEBUG ] ; # _NO_INLINE_ASM @@ -9,17 +9,17 @@ UsePrivateHeaders [ FDirName kernel ] ; # For kernel_cpp.cpp SubDirC++Flags $(defines) -fno-exceptions -fno-rtti ; #-fcheck-memory-usage } -SimpleTest arrayTest +SimpleTest bfsArrayTest : array.cpp Utility.cpp : be ; -SimpleTest smallArrayTest +SimpleTest bfsSmallArrayTest : smallArray.cpp Utility.o : be ; # Tell Jam where to find these sources SEARCH on [ FGristFiles Utility.cpp ] - = [ FDirName $(HAIKU_TOP) src tests add-ons kernel file_systems bfs r5 ] ; + = [ FDirName $(HAIKU_TOP) src add-ons kernel file_systems bfs ] ; diff --git a/src/tests/add-ons/kernel/file_systems/bfs/btree/Jamfile b/src/tests/add-ons/kernel/file_systems/bfs/btree/Jamfile index 18771f1a05..9ddecc106f 100644 --- a/src/tests/add-ons/kernel/file_systems/bfs/btree/Jamfile +++ b/src/tests/add-ons/kernel/file_systems/bfs/btree/Jamfile @@ -13,7 +13,7 @@ rule FPreIncludes { return -include$(1:D=$(SUBDIR)) ; } SubDirC++Flags $(defines) $(preIncludes) -fno-exceptions ; #-fcheck-memory-usage } -SimpleTest btreeTest +SimpleTest bfsBtreeTest : test.cpp Volume.cpp Inode.cpp diff --git a/src/tests/add-ons/kernel/file_systems/bfs/bufferPool/Jamfile b/src/tests/add-ons/kernel/file_systems/bfs/bufferPool/Jamfile index f6ebbf34a9..472d5dfeaa 100644 --- a/src/tests/add-ons/kernel/file_systems/bfs/bufferPool/Jamfile +++ b/src/tests/add-ons/kernel/file_systems/bfs/bufferPool/Jamfile @@ -1,7 +1,7 @@ SubDir HAIKU_TOP src tests add-ons kernel file_systems bfs bufferPool ; -SubDirHdrs $(HAIKU_TOP) src tests add-ons kernel file_systems bfs r5 ; -UsePrivateHeaders [ FDirName kernel ] ; # For kernel_cpp.cpp +SubDirHdrs $(HAIKU_TOP) src add-ons kernel file_systems bfs ; +UsePrivateKernelHeaders ; { local defines = [ FDefines USER DEBUG ] ; # _NO_INLINE_ASM @@ -9,12 +9,12 @@ UsePrivateHeaders [ FDirName kernel ] ; # For kernel_cpp.cpp SubDirC++Flags $(defines) -fno-exceptions -fno-rtti ; #-fcheck-memory-usage } -SimpleTest bufferTest +SimpleTest bfsBufferTest : main.cpp BufferPool.cpp : ; # Tell Jam where to find these sources SEARCH on [ FGristFiles BufferPool.cpp ] - = [ FDirName $(HAIKU_TOP) src tests add-ons kernel file_systems bfs r5 ] ; + = [ FDirName $(HAIKU_TOP) src add-ons kernel file_systems bfs ] ; diff --git a/src/tests/add-ons/kernel/file_systems/bfs/dump_log/Jamfile b/src/tests/add-ons/kernel/file_systems/bfs/dump_log/Jamfile index d2ec05da38..3ad6e32b78 100644 --- a/src/tests/add-ons/kernel/file_systems/bfs/dump_log/Jamfile +++ b/src/tests/add-ons/kernel/file_systems/bfs/dump_log/Jamfile @@ -1,9 +1,9 @@ SubDir HAIKU_TOP src tests add-ons kernel file_systems bfs dump_log ; SubDirHdrs $(HAIKU_TOP) src add-ons kernel file_systems bfs ; -UsePrivateHeaders [ FDirName kernel ] ; # For kernel_cpp.cpp +UsePrivateKernelHeaders ; -SimpleTest dump_log : - dump_log.cpp +SimpleTest bfsdump_log : + bfsdump_log.cpp ; diff --git a/src/tests/add-ons/kernel/file_systems/bfs/queries/Jamfile b/src/tests/add-ons/kernel/file_systems/bfs/queries/Jamfile index 1f16c3822c..daa63bf58b 100644 --- a/src/tests/add-ons/kernel/file_systems/bfs/queries/Jamfile +++ b/src/tests/add-ons/kernel/file_systems/bfs/queries/Jamfile @@ -1,6 +1,6 @@ SubDir HAIKU_TOP src tests add-ons kernel file_systems bfs queries ; -SimpleTest queryTest +SimpleTest bfsQueryTest : test.cpp : be [ TargetLibsupc++ ] ; diff --git a/src/tests/add-ons/kernel/file_systems/bfs/structureSizes/Jamfile b/src/tests/add-ons/kernel/file_systems/bfs/structureSizes/Jamfile index bcbc35e33e..9a32949010 100644 --- a/src/tests/add-ons/kernel/file_systems/bfs/structureSizes/Jamfile +++ b/src/tests/add-ons/kernel/file_systems/bfs/structureSizes/Jamfile @@ -1,6 +1,7 @@ SubDir HAIKU_TOP src tests add-ons kernel file_systems bfs structureSizes ; -SubDirHdrs $(HAIKU_TOP) src tests add-ons kernel file_systems bfs r5 ; +SubDirHdrs $(HAIKU_TOP) src add-ons kernel file_systems bfs ; + { local defines = [ FDefines USER ] ; # _NO_INLINE_ASM @@ -12,11 +13,11 @@ SubDirHdrs $(HAIKU_TOP) src tests add-ons kernel file_systems bfs r5 ; # without _PACKED use: # $ OPTIM=-Ox DEBUG=0 NO_TEST_DEBUG=1 jam -a -SimpleTest structureSizes +SimpleTest bfsStructureSizes : structureSizes.cpp : ; # Tell Jam where to find these sources SEARCH on [ FGristFiles BufferPool.cpp ] - = [ FDirName $(HAIKU_TOP) src tests add-ons kernel file_systems bfs r5 ] ; + = [ FDirName $(HAIKU_TOP) src add-ons kernel file_systems bfs ] ;