[Libreoffice-commits] .: 2 commits - sal/qa

[David Tardon]

 sal/qa/cppunit_local.mk          |   30 ++++++++++++++++++++++++++++++
 sal/qa/osl/condition/makefile.mk |    2 +-
 sal/qa/osl/file/makefile.mk      |    2 +-
 sal/qa/osl/module/makefile.mk    |    2 +-
 sal/qa/osl/mutex/makefile.mk     |    2 +-
 sal/qa/osl/profile/makefile.mk   |    2 +-
 sal/qa/osl/thread/makefile.mk    |    2 +-
 sal/qa/rtl/strings/makefile.mk   |    4 +---
 8 files changed, 37 insertions(+), 9 deletions(-)

New commits:
commit 094c51f51ce40d844424a85dffc1a63faaf26803
Author: David Tardon <dtardon at redhat.com>
Date:   Tue Feb 8 09:34:22 2011 +0100

    use local cppunittester

diff --git a/sal/qa/osl/condition/makefile.mk b/sal/qa/osl/condition/makefile.mk
index 4cb1ac0..ff922e0 100644
--- a/sal/qa/osl/condition/makefile.mk
+++ b/sal/qa/osl/condition/makefile.mk
@@ -64,4 +64,4 @@ SHL1VERSIONMAP = $(PRJ)$/qa$/export.map
 # --- Targets ------------------------------------------------------
 
 .INCLUDE :  target.mk
-.INCLUDE : _cppunit.mk
+.INCLUDE : $(PRJ)$/qa$/cppunit_local.mk
diff --git a/sal/qa/osl/file/makefile.mk b/sal/qa/osl/file/makefile.mk
index 17746d9..c07e754 100644
--- a/sal/qa/osl/file/makefile.mk
+++ b/sal/qa/osl/file/makefile.mk
@@ -89,4 +89,4 @@ SLOFILES=$(SHL1OBJS)
 # --- Targets ------------------------------------------------------
 
 .INCLUDE :  target.mk
-.INCLUDE : _cppunit.mk
+.INCLUDE : $(PRJ)$/qa$/cppunit_local.mk
diff --git a/sal/qa/osl/module/makefile.mk b/sal/qa/osl/module/makefile.mk
index 724862f..6e181cb 100644
--- a/sal/qa/osl/module/makefile.mk
+++ b/sal/qa/osl/module/makefile.mk
@@ -82,5 +82,5 @@ SHL2VERSIONMAP= $(PRJ)$/qa$/export.map
 # --- Targets ------------------------------------------------------
 
 .INCLUDE :  target.mk
-.INCLUDE : _cppunit.mk
+.INCLUDE : $(PRJ)$/qa$/cppunit_local.mk
 
diff --git a/sal/qa/osl/mutex/makefile.mk b/sal/qa/osl/mutex/makefile.mk
index e5b5371..0e7ae05 100755
--- a/sal/qa/osl/mutex/makefile.mk
+++ b/sal/qa/osl/mutex/makefile.mk
@@ -75,6 +75,6 @@ SHL1RPATH = NONE
 # --- Targets ------------------------------------------------------
 
 .INCLUDE :  target.mk
-.INCLUDE : _cppunit.mk
+.INCLUDE : $(PRJ)$/qa$/cppunit_local.mk
 
 .END
diff --git a/sal/qa/osl/profile/makefile.mk b/sal/qa/osl/profile/makefile.mk
index 8b6339e..70e5f2a 100644
--- a/sal/qa/osl/profile/makefile.mk
+++ b/sal/qa/osl/profile/makefile.mk
@@ -75,6 +75,6 @@ SLOFILES=\
 # --- Targets ------------------------------------------------------
 
 .INCLUDE :  target.mk
-.INCLUDE : _cppunit.mk
+.INCLUDE : $(PRJ)$/qa$/cppunit_local.mk
 
 .END
diff --git a/sal/qa/osl/thread/makefile.mk b/sal/qa/osl/thread/makefile.mk
index 972d589..8b5ad83 100644
--- a/sal/qa/osl/thread/makefile.mk
+++ b/sal/qa/osl/thread/makefile.mk
@@ -53,4 +53,4 @@ SLOFILES = $(SHL1OBJS)
 
 .INCLUDE: target.mk
 
-.INCLUDE: _cppunit.mk
+.INCLUDE: $(PRJ)$/qa$/cppunit_local.mk
diff --git a/sal/qa/rtl/strings/makefile.mk b/sal/qa/rtl/strings/makefile.mk
index c62e886..1ba3380 100644
--- a/sal/qa/rtl/strings/makefile.mk
+++ b/sal/qa/rtl/strings/makefile.mk
@@ -34,8 +34,6 @@ ENABLE_EXCEPTIONS := TRUE
 
 .INCLUDE: settings.mk
 
-# cppunittester is built in the same project; cannot use delivered version
-CPPUNITTESTER=$(AUGMENT_LIBRARY_PATH_LOCAL) $(GDBCPPUNITTRACE) $(VALGRINDTOOL) $(BIN)/cppunittester
 
 #building with stlport, but cppunit was not built with stlport
 .IF "$(USE_SYSTEM_STL)"!="YES"
@@ -62,4 +60,4 @@ SHL1VERSIONMAP := $(PRJ)$/qa$/export.map
 DEF1NAME := $(SHL1TARGET)
 
 .INCLUDE: target.mk
-.INCLUDE : _cppunit.mk
+.INCLUDE: $(PRJ)$/qa$/cppunit_local.mk
commit 557ec3088059862958a7bacbe45ea275028bbf15
Author: David Tardon <dtardon at redhat.com>
Date:   Tue Feb 8 09:34:02 2011 +0100

    enable to run non-delivered cppunittester

diff --git a/sal/qa/cppunit_local.mk b/sal/qa/cppunit_local.mk
new file mode 100644
index 0000000..4b452b7
--- /dev/null
+++ b/sal/qa/cppunit_local.mk
@@ -0,0 +1,30 @@
+# Version: MPL 1.1 / GPLv3+ / LGPLv3+
+#
+# The contents of this file are subject to the Mozilla Public License Version
+# 1.1 (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+# http://www.mozilla.org/MPL/
+#
+# Software distributed under the License is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+# for the specific language governing rights and limitations under the
+# License.
+#
+# The Initial Developer of the Original Code is
+#       Red Hat, Inc.
+# Portions created by the Initial Developer are Copyright (C) 2011 the
+# Initial Developer. All Rights Reserved.
+#
+# Contributor(s): David Tardon <dtardon at redhat.com>
+#
+# Alternatively, the contents of this file may be used under the terms of
+# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
+# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
+# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
+# instead of those above.
+
+# cppunittester is built in this module; cannot use delivered version
+# this should be kept in sync with the definition in solenv/inc/settings.mk
+CPPUNITTESTER = $(AUGMENT_LIBRARY_PATH_LOCAL) $(GDBCPPUNITTRACE) $(VALGRINDTOOL) $(BIN)/cppunittester
+
+.INCLUDE : _cppunit.mk