diff options
author | Mathias Bauer <mba@openoffice.org> | 2009-09-14 19:06:55 +0200 |
---|---|---|
committer | Mathias Bauer <mba@openoffice.org> | 2009-09-14 19:06:55 +0200 |
commit | b8a58871dcc7e2398e95d518dff2f739712515e3 (patch) | |
tree | 3e9e8da25856a3c600747976f6c3b9ac3b18e811 | |
parent | merge commit to DEV300_m57 (diff) | |
download | core-b8a58871dcc7e2398e95d518dff2f739712515e3.tar.gz core-b8a58871dcc7e2398e95d518dff2f739712515e3.zip |
#i103496#: split cppunit in a pure external lib and a lib depending on sal -> testshl2
-rw-r--r-- | configmgr/qa/unit/common.hxx | 2 | ||||
-rw-r--r-- | configmgr/qa/unit/makefile.mk | 4 | ||||
-rw-r--r-- | configmgr/qa/unit/threading.cxx | 2 | ||||
-rw-r--r-- | desktop/qa/deployment_misc/makefile.mk | 6 | ||||
-rw-r--r-- | desktop/qa/deployment_misc/test_dp_version.cxx | 2 | ||||
-rwxr-xr-x | shell/qa/makefile.mk | 12 | ||||
-rwxr-xr-x | shell/qa/recent_docs.cxx | 2 |
7 files changed, 13 insertions, 17 deletions
diff --git a/configmgr/qa/unit/common.hxx b/configmgr/qa/unit/common.hxx index d53d52d55ad7..7d5be659283c 100644 --- a/configmgr/qa/unit/common.hxx +++ b/configmgr/qa/unit/common.hxx @@ -44,7 +44,7 @@ #include "com/sun/star/uno/XComponentContext.hpp" #include "cppuhelper/component_context.hxx" #include "cppuhelper/servicefactory.hxx" -#include "cppunit/simpleheader.hxx" +#include "testshl/simpleheader.hxx" #include "osl/file.hxx" #include "osl/thread.h" #include "osl/process.h" diff --git a/configmgr/qa/unit/makefile.mk b/configmgr/qa/unit/makefile.mk index a6a79ebdd0ca..aededf799d4f 100644 --- a/configmgr/qa/unit/makefile.mk +++ b/configmgr/qa/unit/makefile.mk @@ -1,7 +1,7 @@ #************************************************************************* # # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# +# # Copyright 2008 by Sun Microsystems, Inc. # # OpenOffice.org - a multi-platform office productivity suite @@ -41,7 +41,7 @@ DLLPRE = # no leading "lib" on .so files SHL1TARGET = $(TARGET) SHL1OBJS = $(SLO)$/performance.obj $(SLO)$/threading.obj $(SLO)$/ubootstrap.obj -SHL1STDLIBS = $(CPPULIB) $(CPPUHELPERLIB) $(CPPUNITLIB) $(SALLIB) +SHL1STDLIBS = $(CPPULIB) $(CPPUHELPERLIB) $(CPPUNITLIB) $(TESTSHL2LIB) $(SALLIB) SHL1VERSIONMAP = export.map SHL1IMPLIB = i$(SHL1TARGET) DEF1NAME = $(SHL1TARGET) diff --git a/configmgr/qa/unit/threading.cxx b/configmgr/qa/unit/threading.cxx index 1531e9f49138..68baee1c6829 100644 --- a/configmgr/qa/unit/threading.cxx +++ b/configmgr/qa/unit/threading.cxx @@ -53,7 +53,7 @@ class KeyTester : public osl::Thread virtual ~KeyTester () { } - virtual void run () + virtual void SAL_CALL run () { testIteration(); while (!m_pCond->check()) diff --git a/desktop/qa/deployment_misc/makefile.mk b/desktop/qa/deployment_misc/makefile.mk index 39e80ddb1c76..f673f27e49cb 100644 --- a/desktop/qa/deployment_misc/makefile.mk +++ b/desktop/qa/deployment_misc/makefile.mk @@ -1,7 +1,7 @@ #************************************************************************* # # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# +# # Copyright 2008 by Sun Microsystems, Inc. # # OpenOffice.org - a multi-platform office productivity suite @@ -42,7 +42,7 @@ DLLPRE = # no leading "lib" on .so files SHL1TARGET = $(TARGET) SHL1OBJS = $(SLO)$/test_dp_version.obj -SHL1STDLIBS = $(CPPUNITLIB) $(DEPLOYMENTMISCLIB) $(SALLIB) +SHL1STDLIBS = $(CPPUNITLIB) $(DEPLOYMENTMISCLIB) $(SALLIB) $(TESTSHL2LIB) SHL1VERSIONMAP = version.map SHL1IMPLIB = i$(SHL1TARGET) DEF1NAME = $(SHL1TARGET) @@ -54,4 +54,4 @@ SLOFILES = $(SHL1OBJS) ALLTAR: test test .PHONY: $(SHL1TARGETN) - testshl2 $(SHL1TARGETN) + $(TESTSHL2) $(SHL1TARGETN) diff --git a/desktop/qa/deployment_misc/test_dp_version.cxx b/desktop/qa/deployment_misc/test_dp_version.cxx index b1de394e0cd6..728ed52c37b1 100644 --- a/desktop/qa/deployment_misc/test_dp_version.cxx +++ b/desktop/qa/deployment_misc/test_dp_version.cxx @@ -35,7 +35,7 @@ #include <cstddef> -#include "cppunit/simpleheader.hxx" +#include "testshl/simpleheader.hxx" #include "rtl/ustring.h" #include "rtl/ustring.hxx" diff --git a/shell/qa/makefile.mk b/shell/qa/makefile.mk index 70c42e646391..e935abd1c0d6 100755 --- a/shell/qa/makefile.mk +++ b/shell/qa/makefile.mk @@ -1,7 +1,7 @@ #************************************************************************* # # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# +# # Copyright 2008 by Sun Microsystems, Inc. # # OpenOffice.org - a multi-platform office productivity suite @@ -42,17 +42,13 @@ ENABLE_EXCEPTIONS=TRUE .INCLUDE : settings.mk # BEGIN ---------------------------------------------------------------- -# auto generated Target:testjob by codegen.pl +# auto generated Target:testjob by codegen.pl -SHL1OBJS=$(SLO)$/recent_docs.obj $(SLO)$/xml_parser.obj +SHL1OBJS=$(SLO)$/recent_docs.obj $(SLO)$/xml_parser.obj SHL1TARGET=recent_docs -SHL1STDLIBS=$(SALLIB) +SHL1STDLIBS=$(SALLIB) $(CPPUNITLIB) $(TESTSHL2LIB) -.IF "$(GUI)" == "WNT" -SHL1STDLIBS+= $(SOLARLIBDIR)$/cppunit.lib -.ENDIF .IF "$(GUI)" == "UNX" -SHL1STDLIBS+=$(SOLARLIBDIR)$/libcppunit$(DLLPOSTFIX).a \ ..$/unxsols4.pro$/slb$/libsysshell.a \ $(EXPATASCII3RDLIB) .ENDIF diff --git a/shell/qa/recent_docs.cxx b/shell/qa/recent_docs.cxx index df0266d24156..5936c8c033b1 100755 --- a/shell/qa/recent_docs.cxx +++ b/shell/qa/recent_docs.cxx @@ -31,7 +31,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_shell.hxx" -#include <cppunit/simpleheader.hxx> +#include <testshl/simpleheader.hxx> #include "systemshell.hxx" #include "osl/file.hxx" |