diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2011-09-12 14:41:08 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2011-09-12 22:47:48 +0200 |
| commit | 30ad5e9d87adec68971464d49c733e29fc643847 (patch) | |
| tree | f181812ee1946eb2c5e755569fa6c2a333716357 /solenv | |
| parent | fs34b: #i117545# (patch provided by mathias.bauer@oracle.com) (diff) | |
| download | core-30ad5e9d87adec68971464d49c733e29fc643847.tar.gz core-30ad5e9d87adec68971464d49c733e29fc643847.zip | |
sb140: #i117694# some CppUnit related cleanup
Diffstat (limited to 'solenv')
| -rw-r--r-- | solenv/inc/_cppunit.mk | 20 | ||||
| -rw-r--r-- | solenv/inc/cppunit.mk | 2 |
2 files changed, 11 insertions, 11 deletions
diff --git a/solenv/inc/_cppunit.mk b/solenv/inc/_cppunit.mk index 85804dd41ac6..8f9f973716ab 100644 --- a/solenv/inc/_cppunit.mk +++ b/solenv/inc/_cppunit.mk @@ -1,7 +1,7 @@ # unroll begin # ---- create the test libraries ------------------------------------ -.IF "$(SHL1TARGETN)"!="" +.IF "$(SHL1TARGETN)"!="" && "$(SHL1CPPUNITTEST)"!="FALSE" ALLTAR : test1 test1 .PHONY : $(SHL1TARGETN) @echo ---------------------------------------------------------- @@ -13,7 +13,7 @@ test1 .PHONY : $(SHL1TARGETN) # unroll begin # ---- create the test libraries ------------------------------------ -.IF "$(SHL2TARGETN)"!="" +.IF "$(SHL2TARGETN)"!="" && "$(SHL2CPPUNITTEST)"!="FALSE" ALLTAR : test2 test2 .PHONY : $(SHL2TARGETN) @echo ---------------------------------------------------------- @@ -25,7 +25,7 @@ test2 .PHONY : $(SHL2TARGETN) # unroll begin # ---- create the test libraries ------------------------------------ -.IF "$(SHL3TARGETN)"!="" +.IF "$(SHL3TARGETN)"!="" && "$(SHL3CPPUNITTEST)"!="FALSE" ALLTAR : test3 test3 .PHONY : $(SHL3TARGETN) @echo ---------------------------------------------------------- @@ -37,7 +37,7 @@ test3 .PHONY : $(SHL3TARGETN) # unroll begin # ---- create the test libraries ------------------------------------ -.IF "$(SHL4TARGETN)"!="" +.IF "$(SHL4TARGETN)"!="" && "$(SHL4CPPUNITTEST)"!="FALSE" ALLTAR : test4 test4 .PHONY : $(SHL4TARGETN) @echo ---------------------------------------------------------- @@ -49,7 +49,7 @@ test4 .PHONY : $(SHL4TARGETN) # unroll begin # ---- create the test libraries ------------------------------------ -.IF "$(SHL5TARGETN)"!="" +.IF "$(SHL5TARGETN)"!="" && "$(SHL5CPPUNITTEST)"!="FALSE" ALLTAR : test5 test5 .PHONY : $(SHL5TARGETN) @echo ---------------------------------------------------------- @@ -61,7 +61,7 @@ test5 .PHONY : $(SHL5TARGETN) # unroll begin # ---- create the test libraries ------------------------------------ -.IF "$(SHL6TARGETN)"!="" +.IF "$(SHL6TARGETN)"!="" && "$(SHL6CPPUNITTEST)"!="FALSE" ALLTAR : test6 test6 .PHONY : $(SHL6TARGETN) @echo ---------------------------------------------------------- @@ -73,7 +73,7 @@ test6 .PHONY : $(SHL6TARGETN) # unroll begin # ---- create the test libraries ------------------------------------ -.IF "$(SHL7TARGETN)"!="" +.IF "$(SHL7TARGETN)"!="" && "$(SHL7CPPUNITTEST)"!="FALSE" ALLTAR : test7 test7 .PHONY : $(SHL7TARGETN) @echo ---------------------------------------------------------- @@ -85,7 +85,7 @@ test7 .PHONY : $(SHL7TARGETN) # unroll begin # ---- create the test libraries ------------------------------------ -.IF "$(SHL8TARGETN)"!="" +.IF "$(SHL8TARGETN)"!="" && "$(SHL8CPPUNITTEST)"!="FALSE" ALLTAR : test8 test8 .PHONY : $(SHL8TARGETN) @echo ---------------------------------------------------------- @@ -97,7 +97,7 @@ test8 .PHONY : $(SHL8TARGETN) # unroll begin # ---- create the test libraries ------------------------------------ -.IF "$(SHL9TARGETN)"!="" +.IF "$(SHL9TARGETN)"!="" && "$(SHL9CPPUNITTEST)"!="FALSE" ALLTAR : test9 test9 .PHONY : $(SHL9TARGETN) @echo ---------------------------------------------------------- @@ -109,7 +109,7 @@ test9 .PHONY : $(SHL9TARGETN) # unroll begin # ---- create the test libraries ------------------------------------ -.IF "$(SHL10TARGETN)"!="" +.IF "$(SHL10TARGETN)"!="" && "$(SHL10CPPUNITTEST)"!="FALSE" ALLTAR : test10 test10 .PHONY : $(SHL10TARGETN) @echo ---------------------------------------------------------- diff --git a/solenv/inc/cppunit.mk b/solenv/inc/cppunit.mk index b30ca7152700..af3639138fb2 100644 --- a/solenv/inc/cppunit.mk +++ b/solenv/inc/cppunit.mk @@ -44,7 +44,7 @@ # unroll begin # ---- create the test libraries ------------------------------------ -.IF "$(SHL$(TNR)TARGETN)"!="" +.IF "$(SHL$(TNR)TARGETN)"!="" && "$(SHL$(TNR)CPPUNITTEST)"!="FALSE" ALLTAR : test$(TNR) test$(TNR) .PHONY : $(SHL$(TNR)TARGETN) @echo ---------------------------------------------------------- |