Author: damjan
Date: Sat Aug 29 14:23:20 2015
New Revision: 1700037
URL: http://svn.apache.org/r1700037
Log:
#i125003# add Google Test APPnTARGET_run targets for n=2..10, which commit
1599163
must have missed out ("Up to 9 run unit test targets are supported" says the
Wiki,
even though only 1 exists in main/solenv/inc/_tg_app.mk).
Modified:
openoffice/trunk/main/solenv/inc/_tg_app.mk
Modified: openoffice/trunk/main/solenv/inc/_tg_app.mk
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/solenv/inc/_tg_app.mk?rev=1700037&r1=1700036&r2=1700037&view=diff
==============================================================================
--- openoffice/trunk/main/solenv/inc/_tg_app.mk (original)
+++ openoffice/trunk/main/solenv/inc/_tg_app.mk Sat Aug 29 14:23:20 2015
@@ -287,6 +287,7 @@ $(APP1TARGET)_run: $(APP1TARGETN)
.ENDIF
+
# Instruction for linking
# unroll begin
@@ -546,6 +547,14 @@ $(APP2TARGETN): $(APP2OBJS) $(APP2LIBS)
.ENDIF # "$(APP2TARGETN)"!=""
+# New rule for automatic run targets of unit test targets
+.IF "$(APP2TEST)" == "enabled" && "$(APP2TARGET)" != ""
+
+$(APP2TARGET)_run: $(APP2TARGETN)
+ $(COMMAND_ECHO) $(AUGMENT_LIBRARY_PATH_LOCAL) $(APP2TARGETN)
--gtest_output="xml:$(BIN)/$(APP2TARGET)_result.xml"
+
+.ENDIF
+
# Instruction for linking
# unroll begin
@@ -806,6 +815,14 @@ $(APP3TARGETN): $(APP3OBJS) $(APP3LIBS)
.ENDIF # "$(APP3TARGETN)"!=""
+# New rule for automatic run targets of unit test targets
+.IF "$(APP3TEST)" == "enabled" && "$(APP3TARGET)" != ""
+
+$(APP3TARGET)_run: $(APP3TARGETN)
+ $(COMMAND_ECHO) $(AUGMENT_LIBRARY_PATH_LOCAL) $(APP3TARGETN)
--gtest_output="xml:$(BIN)/$(APP3TARGET)_result.xml"
+
+.ENDIF
+
# Instruction for linking
# unroll begin
@@ -1066,6 +1083,14 @@ $(APP4TARGETN): $(APP4OBJS) $(APP4LIBS)
.ENDIF # "$(APP4TARGETN)"!=""
+# New rule for automatic run targets of unit test targets
+.IF "$(APP4TEST)" == "enabled" && "$(APP4TARGET)" != ""
+
+$(APP4TARGET)_run: $(APP4TARGETN)
+ $(COMMAND_ECHO) $(AUGMENT_LIBRARY_PATH_LOCAL) $(APP4TARGETN)
--gtest_output="xml:$(BIN)/$(APP4TARGET)_result.xml"
+
+.ENDIF
+
# Instruction for linking
# unroll begin
@@ -1326,6 +1351,14 @@ $(APP5TARGETN): $(APP5OBJS) $(APP5LIBS)
.ENDIF # "$(APP5TARGETN)"!=""
+# New rule for automatic run targets of unit test targets
+.IF "$(APP5TEST)" == "enabled" && "$(APP5TARGET)" != ""
+
+$(APP5TARGET)_run: $(APP5TARGETN)
+ $(COMMAND_ECHO) $(AUGMENT_LIBRARY_PATH_LOCAL) $(APP5TARGETN)
--gtest_output="xml:$(BIN)/$(APP5TARGET)_result.xml"
+
+.ENDIF
+
# Instruction for linking
# unroll begin
@@ -1586,6 +1619,14 @@ $(APP6TARGETN): $(APP6OBJS) $(APP6LIBS)
.ENDIF # "$(APP6TARGETN)"!=""
+# New rule for automatic run targets of unit test targets
+.IF "$(APP6TEST)" == "enabled" && "$(APP6TARGET)" != ""
+
+$(APP6TARGET)_run: $(APP6TARGETN)
+ $(COMMAND_ECHO) $(AUGMENT_LIBRARY_PATH_LOCAL) $(APP6TARGETN)
--gtest_output="xml:$(BIN)/$(APP6TARGET)_result.xml"
+
+.ENDIF
+
# Instruction for linking
# unroll begin
@@ -1846,6 +1887,14 @@ $(APP7TARGETN): $(APP7OBJS) $(APP7LIBS)
.ENDIF # "$(APP7TARGETN)"!=""
+# New rule for automatic run targets of unit test targets
+.IF "$(APP7TEST)" == "enabled" && "$(APP7TARGET)" != ""
+
+$(APP7TARGET)_run: $(APP7TARGETN)
+ $(COMMAND_ECHO) $(AUGMENT_LIBRARY_PATH_LOCAL) $(APP7TARGETN)
--gtest_output="xml:$(BIN)/$(APP7TARGET)_result.xml"
+
+.ENDIF
+
# Instruction for linking
# unroll begin
@@ -2106,6 +2155,14 @@ $(APP8TARGETN): $(APP8OBJS) $(APP8LIBS)
.ENDIF # "$(APP8TARGETN)"!=""
+# New rule for automatic run targets of unit test targets
+.IF "$(APP8TEST)" == "enabled" && "$(APP8TARGET)" != ""
+
+$(APP8TARGET)_run: $(APP8TARGETN)
+ $(COMMAND_ECHO) $(AUGMENT_LIBRARY_PATH_LOCAL) $(APP8TARGETN)
--gtest_output="xml:$(BIN)/$(APP8TARGET)_result.xml"
+
+.ENDIF
+
# Instruction for linking
# unroll begin
@@ -2366,6 +2423,14 @@ $(APP9TARGETN): $(APP9OBJS) $(APP9LIBS)
.ENDIF # "$(APP9TARGETN)"!=""
+# New rule for automatic run targets of unit test targets
+.IF "$(APP9TEST)" == "enabled" && "$(APP9TARGET)" != ""
+
+$(APP9TARGET)_run: $(APP9TARGETN)
+ $(COMMAND_ECHO) $(AUGMENT_LIBRARY_PATH_LOCAL) $(APP9TARGETN)
--gtest_output="xml:$(BIN)/$(APP9TARGET)_result.xml"
+
+.ENDIF
+
# Instruction for linking
# unroll begin
@@ -2626,5 +2691,13 @@ $(APP10TARGETN): $(APP10OBJS) $(APP10LIB
.ENDIF # "$(APP10TARGETN)"!=""
+# New rule for automatic run targets of unit test targets
+.IF "$(APP10TEST)" == "enabled" && "$(APP10TARGET)" != ""
+
+$(APP10TARGET)_run: $(APP10TARGETN)
+ $(COMMAND_ECHO) $(AUGMENT_LIBRARY_PATH_LOCAL) $(APP10TARGETN)
--gtest_output="xml:$(BIN)/$(APP10TARGET)_result.xml"
+
+.ENDIF
+
# Instruction for linking
