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:
@@ -123,12 +123,5 @@ SLOFILES=$(SHL1OBJS)
|
|||||||
|
|
||||||
# --- Enable test execution in normal build ------------------------
|
# --- Enable test execution in normal build ------------------------
|
||||||
.IF "$(L10N_framework)"==""
|
.IF "$(L10N_framework)"==""
|
||||||
|
.INCLUDE : _cppunit.mk
|
||||||
unittest : $(SHL1TARGETN)
|
|
||||||
@echo ----------------------------------------------------------
|
|
||||||
@echo - start unit test on library $(SHL1TARGETN)
|
|
||||||
@echo ----------------------------------------------------------
|
|
||||||
$(CPPUNITTESTER) $(SHL1TARGETN)
|
|
||||||
|
|
||||||
ALLTAR : unittest
|
|
||||||
.ENDIF
|
.ENDIF
|
||||||
|
@@ -71,14 +71,4 @@ SLOFILES=$(SHL1OBJS)
|
|||||||
# --- Targets ------------------------------------------------------
|
# --- Targets ------------------------------------------------------
|
||||||
|
|
||||||
.INCLUDE : target.mk
|
.INCLUDE : target.mk
|
||||||
|
.INCLUDE : _cppunit.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
|
|
||||||
|
@@ -72,12 +72,6 @@ SLOFILES=$(SHL1OBJS)
|
|||||||
|
|
||||||
# --- Enable test execution in normal build ------------------------
|
# --- Enable test execution in normal build ------------------------
|
||||||
.IF "$(L10N_framework)"==""
|
.IF "$(L10N_framework)"==""
|
||||||
unittest : $(SHL1TARGETN)
|
.INCLUDE : _cppunit.mk
|
||||||
@echo ----------------------------------------------------------
|
|
||||||
@echo - start unit test on library $(SHL1TARGETN)
|
|
||||||
@echo ----------------------------------------------------------
|
|
||||||
$(CPPUNITTESTER) $(SHL1TARGETN)
|
|
||||||
|
|
||||||
ALLTAR : unittest
|
|
||||||
.ENDIF # L10N_framework
|
.ENDIF # L10N_framework
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user