diff options
| author | Jens-Heiner Rechtien <hr@openoffice.org> | 2007-06-27 11:42:18 +0000 |
|---|---|---|
| committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2007-06-27 11:42:18 +0000 |
| commit | 78103a91babd419f48c60095ea3885835be63ca6 (patch) | |
| tree | d1aa4b896d6cb1905a2e7341d292787e04a1a404 /basebmp | |
| parent | 0f8f7ae16e807ba223383821af3eeb3cdf139a33 (diff) | |
INTEGRATION: CWS basebmp01 (1.6.20); FILE MERGED
2007/06/22 19:50:30 thb 1.6.20.3: #i10000# Must not use lib to test against - not yet delivered at the time the tests must run. Linking statically instead.
2007/05/22 21:17:38 thb 1.6.20.2: #147378# Enabled unit tests for normal build
2007/05/22 09:59:18 thb 1.6.20.1: #147378# Added support for foreign formats (via GenericColorImageAccessor); fixed typos in CompositeIterator and StridedArrayIterator; fixed comparisons for (Packed)PixelIterator and StridedArrayIterator (which got negative strides wrong); avoiding unnecessary copying in scale_image() now; cleaned up bitmapdevice.cxx from cruft/ad hoc debug code; made unit tests run again
Diffstat (limited to 'basebmp')
| -rw-r--r-- | basebmp/test/makefile.mk | 28 |
1 files changed, 22 insertions, 6 deletions
diff --git a/basebmp/test/makefile.mk b/basebmp/test/makefile.mk index b21c41024972..edd2f8b1409f 100644 --- a/basebmp/test/makefile.mk +++ b/basebmp/test/makefile.mk @@ -4,9 +4,9 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.6 $ +# $Revision: 1.7 $ # -# last change: $Author: thb $ $Date: 2006-07-27 11:35:32 $ +# last change: $Author: hr $ $Date: 2007-06-27 12:42:18 $ # # The Contents of this file are made available subject to # the terms of GNU Lesser General Public License Version 2.1. @@ -65,20 +65,26 @@ CFLAGS += -fno-inline # auto generated Target:tests by codegen.pl SHL1OBJS= \ $(SLO)$/basictest.obj \ - $(SLO)$/bmptest.obj \ $(SLO)$/bmpmasktest.obj \ + $(SLO)$/bmptest.obj \ $(SLO)$/cliptest.obj \ $(SLO)$/filltest.obj \ $(SLO)$/linetest.obj \ $(SLO)$/masktest.obj \ $(SLO)$/polytest.obj \ - $(SLO)$/tools.obj + $(SLO)$/tools.obj \ + $(SLO)$/bitmapdevice.obj \ + $(SLO)$/debug.obj \ + $(SLO)$/polypolygonrenderer.obj +# last three objs are a bit of a hack: cannot link against LIBBASEBMP +# here, because not yet delivered. Need the functionality to test, so +# we're linking it in statically. Need to keep this in sync with +# source/makefile.mk SHL1TARGET= tests SHL1STDLIBS= $(SALLIB) \ $(CPPUNITLIB) \ - $(BASEGFXLIB) \ - $(BASEBMPLIB) + $(BASEGFXLIB) SHL1IMPLIB= i$(SHL1TARGET) @@ -114,3 +120,13 @@ SLOFILES=$(SHL1OBJS) .INCLUDE : target.mk .INCLUDE : _cppunit.mk + +# --- Enable test execution in normal build ------------------------ + +unittest : $(SHL1TARGETN) + @echo ---------------------------------------------------------- + @echo - start unit test on library $(SHL1TARGETN) + @echo ---------------------------------------------------------- + testshl2 $(SHL1TARGETN) + +ALLTAR : unittest |