diff options
| author | Oliver Bolte <obo@openoffice.org> | 2004-03-19 13:22:04 +0000 |
|---|---|---|
| committer | Oliver Bolte <obo@openoffice.org> | 2004-03-19 13:22:04 +0000 |
| commit | 1d1d4f8de47bf8bb51e65e7c5641fc1634590ee0 (patch) | |
| tree | 86c08252eab99ea3e956fccf100dbe1f4fd94d79 /solenv/inc/cppunit.mk | |
| parent | bd53aa94ecb26a4ad9d6c30f5308599c96db0c81 (diff) | |
INTEGRATION: CWS qadev16 (1.2.24); FILE MERGED
2004/02/05 14:34:46 lla 1.2.24.1: #114786# changes for dmake test within sal qa directory, handles now jobexclusion
Diffstat (limited to 'solenv/inc/cppunit.mk')
| -rw-r--r-- | solenv/inc/cppunit.mk | 23 |
1 files changed, 16 insertions, 7 deletions
diff --git a/solenv/inc/cppunit.mk b/solenv/inc/cppunit.mk index e3399af4377f..dcf2ec788d6c 100644 --- a/solenv/inc/cppunit.mk +++ b/solenv/inc/cppunit.mk @@ -2,9 +2,9 @@ # # $RCSfile: cppunit.mk,v $ # -# $Revision: 1.2 $ +# $Revision: 1.3 $ # -# last change: $Author: kz $ $Date: 2003-11-18 16:07:34 $ +# last change: $Author: obo $ $Date: 2004-03-19 14:22:04 $ # # The Contents of this file are made available subject to the terms of # either of the following licenses @@ -78,23 +78,32 @@ # $(TNR) is the number # $(SHL$(TNR)TARGETN) is the same like $(OUT)$/bin$/$(SHL1TARGET) for every number, within unix, "bin" is replaced by "lib" -.IF "$(TESTOPT)"=="" - TESTOPT="-onlyerrors" -.ENDIF +#.IF "$(TESTOPT)"=="" +# TESTOPT="-onlyerrors" +#.ENDIF ################################################################################ # unroll begin # ---- create the test libraries ------------------------------------ TEST$(TNR)LIB=$(SHL$(TNR)TARGETN) +.IF "$(TESTOPT)"=="" + TEST$(TNR)OPT="-jobexclude" + TEST$(TNR)OPT+=$(SHL$(TNR)TARGET).xsce + TEST$(TNR)OPT+="-onlyerrors" + TEST$(TNR)OPT+=" " + TEST$(TNR)OPT+=$(TESTOPTADD) +.ELSE + TEST$(TNR)OPT=$(TESTOPT) +.ENDIF .IF "$(SHL$(TNR)TARGET)"!="" test : test$(TNR) test$(TNR): ALLTAR @+echo ---------------------------------------------------------- - @+echo - start cppunit test \#$(TNR) on library $(TEST$(TNR)LIB) + @+echo - start unit test \#$(TNR) on library $(TEST$(TNR)LIB) @+echo ---------------------------------------------------------- - testshl2 $(TEST$(TNR)LIB) $(TESTOPT) + testshl2 $(TEST$(TNR)LIB) $(TEST$(TNR)OPT) .ENDIF # unroll end |