diff options
author | Bjoern Michaelsen <bjoern.michaelsen@canonical.com> | 2011-03-28 02:20:47 +0200 |
---|---|---|
committer | Bjoern Michaelsen <bjoern.michaelsen@canonical.com> | 2011-03-28 02:23:53 +0200 |
commit | ac4c98e868c6e7b946cc54636b740d22eca51dc8 (patch) | |
tree | 30f04a18d0269d0ed698a33b95b95786c2c2ec4f /sal/qa/osl/profile | |
parent | a63805b5e3fddf1f3fdb4cc351afa393b3b19612 (diff) |
migrate sal subsequenttests to gbuild
Diffstat (limited to 'sal/qa/osl/profile')
-rw-r--r-- | sal/qa/osl/profile/makefile.mk | 72 | ||||
-rw-r--r-- | sal/qa/osl/profile/osl_old_testprofile.cxx | 9 |
2 files changed, 1 insertions, 80 deletions
diff --git a/sal/qa/osl/profile/makefile.mk b/sal/qa/osl/profile/makefile.mk deleted file mode 100644 index 6f7d3e8d34cf..000000000000 --- a/sal/qa/osl/profile/makefile.mk +++ /dev/null @@ -1,72 +0,0 @@ -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2000, 2010 Oracle and/or its affiliates. -# -# OpenOffice.org - a multi-platform office productivity suite -# -# This file is part of OpenOffice.org. -# -# OpenOffice.org is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License version 3 -# only, as published by the Free Software Foundation. -# -# OpenOffice.org is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public License version 3 for more details -# (a copy is included in the LICENSE file that accompanied this code). -# -# You should have received a copy of the GNU Lesser General Public License -# version 3 along with OpenOffice.org. If not, see -# <http://www.openoffice.org/license.html> -# for a copy of the LGPLv3 License. -# -#************************************************************************* - -.IF "$(OOO_SUBSEQUENT_TESTS)" == "" -nothing .PHONY: -.ELSE - -PRJ=..$/..$/.. - -PRJNAME=sal -TARGET=qa_osl_profile - -ENABLE_EXCEPTIONS=TRUE - -# --- Settings ----------------------------------------------------- - -.INCLUDE : settings.mk - -CFLAGS+= $(LFS_CFLAGS) -CXXFLAGS+= $(LFS_CFLAGS) - -CFLAGSCXX += $(CPPUNIT_CFLAGS) - -# BEGIN ---------------------------------------------------------------- -SHL1OBJS= \ - $(SLO)$/osl_old_testprofile.obj - -SHL1TARGET= osl_old_testprofile -SHL1STDLIBS= $(SALLIB) $(CPPUNITLIB) - -SHL1IMPLIB= i$(SHL1TARGET) -DEF1NAME =$(SHL1TARGET) -SHL1VERSIONMAP = $(PRJ)$/qa$/export.map -SHL1RPATH = NONE -# END ------------------------------------------------------------------ - - -#------------------------------- All object files ------------------------------- -# do this here, so we get right dependencies -SLOFILES=\ - $(SHL1OBJS) - -# --- Targets ------------------------------------------------------ - -.INCLUDE : target.mk -.INCLUDE : $(PRJ)$/qa$/cppunit_local.mk - -.END diff --git a/sal/qa/osl/profile/osl_old_testprofile.cxx b/sal/qa/osl/profile/osl_old_testprofile.cxx index 9c3ca4caa4c2..f2695a3084c1 100644 --- a/sal/qa/osl/profile/osl_old_testprofile.cxx +++ b/sal/qa/osl/profile/osl_old_testprofile.cxx @@ -26,9 +26,6 @@ * ************************************************************************/ -// MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_sal.hxx" - // LLA: // this file is converted to use with testshl2 // original was placed in sal/test/textenc.cxx @@ -37,11 +34,7 @@ // ----------------------------------------------------------------------------- #include <stdio.h> #include <osl/profile.h> - -#include "cppunit/TestAssert.h" -#include "cppunit/TestFixture.h" -#include "cppunit/extensions/HelperMacros.h" -#include "cppunit/plugin/TestPlugIn.h" +#include <sal/cppunit.h> //================================================================================================== |