[Libreoffice-commits] core.git: Branch 'aoo/trunk' - 3 commits - codemaker/test cppuhelper/qa cppu/qa

[Damjan Jovanovic]

 codemaker/test/cppumaker/makefile.mk |    6 ++++++
 cppu/qa/makefile.mk                  |    5 ++++-
 cppuhelper/qa/unourl/cppu_unourl.cxx |    6 ++++++
 cppuhelper/qa/unourl/makefile.mk     |    3 +--
 4 files changed, 17 insertions(+), 3 deletions(-)

New commits:
commit 0c0bb56d4d08f918d0df1b43a5c2b01177ca51af
Author: Damjan Jovanovic <damjan at apache.org>
Date:   Mon Aug 31 06:41:01 2015 +0000

    Make all cppu tests depend on the idl results. Without this,
    
    "build -P2 -- -P2" often breaks.

diff --git a/cppu/qa/makefile.mk b/cppu/qa/makefile.mk
index da2d879..1a51ca8 100644
--- a/cppu/qa/makefile.mk
+++ b/cppu/qa/makefile.mk
@@ -65,6 +65,9 @@ APP4TEST = enabled
 .INCLUDE: target.mk
 
 $(APP1OBJS): $(MISC)$/$(TARGET).cppumaker.flag
+$(APP2OBJS): $(MISC)$/$(TARGET).cppumaker.flag
+$(APP3OBJS): $(MISC)$/$(TARGET).cppumaker.flag
+$(APP4OBJS): $(MISC)$/$(TARGET).cppumaker.flag
 
 $(MISC)$/$(TARGET).cppumaker.flag: $(MISC)$/$(TARGET).rdb
     - $(MKDIRHIER) $(MISC)$/$(TARGET)$/inc
@@ -80,4 +83,4 @@ $(MISC)$/$(TARGET)$/types.urd: types.idl
     - $(MKDIR) $(MISC)$/$(TARGET)
     $(IDLC) -O$(MISC)$/$(TARGET) -I$(SOLARIDLDIR) -cid -we $<
 
-.ENDIF # "$(ENABLE_UNIT_TESTS)" != "YES"
\ No newline at end of file
+.ENDIF # "$(ENABLE_UNIT_TESTS)" != "YES"
commit 4386b44824c18859acf06579884a685427355b26
Author: Damjan Jovanovic <damjan at apache.org>
Date:   Mon Aug 31 06:23:16 2015 +0000

    Add a missing main() function to a main/cppuhelper test.

diff --git a/cppuhelper/qa/unourl/cppu_unourl.cxx b/cppuhelper/qa/unourl/cppu_unourl.cxx
index 5bdc6e3..1691b89 100644
--- a/cppuhelper/qa/unourl/cppu_unourl.cxx
+++ b/cppuhelper/qa/unourl/cppu_unourl.cxx
@@ -446,3 +446,9 @@ namespace cppu_unourl
     }
 } // namespace cppu_ifcontainer
 
+int main(int argc, char **argv)
+{
+    ::testing::InitGoogleTest(&argc, argv);
+    return RUN_ALL_TESTS();
+}
+
diff --git a/cppuhelper/qa/unourl/makefile.mk b/cppuhelper/qa/unourl/makefile.mk
index abf0e16..8011ea5 100644
--- a/cppuhelper/qa/unourl/makefile.mk
+++ b/cppuhelper/qa/unourl/makefile.mk
@@ -40,8 +40,7 @@ all:
 # BEGIN ----------------------------------------------------------------
 # auto generated Target:joblist by codegen.pl
 APP1OBJS=  \
-    $(SLO)$/cppu_unourl.obj \
-    $(SLO)$/main.obj
+    $(SLO)$/cppu_unourl.obj
 APP1TARGET= cppu_unourl
 APP1STDLIBS=\
     $(CPPUHELPERLIB) \
commit 72fd0079a6efa4f27c223f1a0d16dafaf1ff04f7
Author: Damjan Jovanovic <damjan at apache.org>
Date:   Mon Aug 31 06:22:13 2015 +0000

    Make main/cppumaker an OOO_SUBSEQUENT_TESTS test as it needs files only built after itself to compile.

diff --git a/codemaker/test/cppumaker/makefile.mk b/codemaker/test/cppumaker/makefile.mk
index d2aabf6..69dc75e 100644
--- a/codemaker/test/cppumaker/makefile.mk
+++ b/codemaker/test/cppumaker/makefile.mk
@@ -21,6 +21,10 @@
 
 
 
+.IF "$(OOO_SUBSEQUENT_TESTS)" == ""
+nothing .PHONY:
+.ELSE
+
 PRJ := ..$/..
 PRJNAME := codemaker
 TARGET := test_codemaker_cppumaker
@@ -63,3 +67,5 @@ $(MISC)$/$(TARGET)$/types.urd: types.idl
 
 
 .ENDIF # "$(ENABLE_UNIT_TESTS)" != "YES"
+
+.END # "$(OOO_SUBSEQUENT_TESTS)" == ""