sb118: adapted cppunit.mk to cppunittester and no longer require "dmake test" to run tests; changed places back to include _cppunit.mk where it had been taken out before
This commit is contained in:
parent
ec0f00417a
commit
e6fd0d7630
3 changed files with 3 additions and 26 deletions
|
@ -123,12 +123,5 @@ SLOFILES=$(SHL1OBJS)
|
|||
|
||||
# --- Enable test execution in normal build ------------------------
|
||||
.IF "$(L10N_framework)"==""
|
||||
|
||||
unittest : $(SHL1TARGETN)
|
||||
@echo ----------------------------------------------------------
|
||||
@echo - start unit test on library $(SHL1TARGETN)
|
||||
@echo ----------------------------------------------------------
|
||||
$(CPPUNITTESTER) $(SHL1TARGETN)
|
||||
|
||||
ALLTAR : unittest
|
||||
.INCLUDE : _cppunit.mk
|
||||
.ENDIF
|
||||
|
|
|
@ -71,14 +71,4 @@ SLOFILES=$(SHL1OBJS)
|
|||
# --- Targets ------------------------------------------------------
|
||||
|
||||
.INCLUDE : target.mk
|
||||
|
||||
# --- Enable testshl2 execution in normal build ------------------------
|
||||
|
||||
$(MISC)$/unittest_succeeded : $(SHL1TARGETN)
|
||||
@echo ----------------------------------------------------------
|
||||
@echo - start unit test on library $(SHL1TARGETN)
|
||||
@echo ----------------------------------------------------------
|
||||
$(CPPUNITTESTER) $(SHL1TARGETN)
|
||||
$(TOUCH) $@
|
||||
|
||||
ALLTAR : $(MISC)$/unittest_succeeded
|
||||
.INCLUDE : _cppunit.mk
|
||||
|
|
|
@ -72,12 +72,6 @@ SLOFILES=$(SHL1OBJS)
|
|||
|
||||
# --- Enable test execution in normal build ------------------------
|
||||
.IF "$(L10N_framework)"==""
|
||||
unittest : $(SHL1TARGETN)
|
||||
@echo ----------------------------------------------------------
|
||||
@echo - start unit test on library $(SHL1TARGETN)
|
||||
@echo ----------------------------------------------------------
|
||||
$(CPPUNITTESTER) $(SHL1TARGETN)
|
||||
|
||||
ALLTAR : unittest
|
||||
.INCLUDE : _cppunit.mk
|
||||
.ENDIF # L10N_framework
|
||||
|
||||
|
|
Loading…
Reference in a new issue