i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

It became apparent that in order to assure obos tests are run

Browse Source 
with obos libs and r5 tests are run with r5 libs, two separate
unit testing programs in different directories would be needed.
Thus UnitTester is now just a shell program that calls the
appropriate unittester/UnitTester or unittester_r5/UnitTester_r5
program.


git-svn-id: file:///srv/svn/repos/haiku/trunk/current@703 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Tyler Dauwalder
2002-08-11 03:45:17 +00:00
parent d8575caf51
commit c5ff4aa6f5
5 changed files with 86 additions and 89 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Jamrules
+5 -7
View File
@@ -228,7 +228,7 @@ NOTFILE r5tests ;
rule CommonTestLib
{
# CommonUnitTest <target> : <sources> : <obos libraries>
# CommonTestLib <target> : <sources> : <obos libraries>
# : <r5 libraries> : <test libraries> : <public headers>;
# Builds a unit test for both OBOS and R5 modules.
# <target> The name of the target.
@@ -243,10 +243,8 @@ rule CommonTestLib
# <public headers> A list of public header dirs (as passed to
# UsePublicHeaders).
local testlibdir = [ FDirName $(OBOS_TEST_DIR) lib ] ; #/boot/home/config/lib/obos_tests ;
TestLib $(1) : $(2) : $(testlibdir) : $(3) $(5) : $(6) ;
R5TestLib $(1) : $(2) : $(testlibdir) : $(4) [ R5SharedLibraryNames $(5) ] ;
TestLib $(1) : $(2) : [ FDirName $(OBOS_TEST_DIR) unittester lib ] : $(3) $(5) : $(6) ;
R5TestLib $(1) : $(2) : [ FDirName $(OBOS_TEST_DIR) unittester_r5 lib ] : $(4) [ R5SharedLibraryNames $(5) ] ;
}
rule TestLib
@@ -280,7 +278,7 @@ rule TestLib
rule R5TestLib
{
# R5UnitTest <target> : <sources> : <dest> : <libraries>
# R5TestLib <target> : <sources> : <dest> : <libraries>
# Builds a unit test for an R5 module. "_r5" is appended to the object
# and the target name.
# <target> The name of the target.
@@ -290,7 +288,7 @@ rule R5TestLib
local target = $(1:B)_r5$(1:S) ;
local sources = $(2) ;
local dest = $(3)_r5 ;
local dest = $(3) ;
local libraries = $(4) ;
local objects = [ R5ObjectNames $(sources) ] ;