Author: jsc
Date: Tue Jun 3 08:25:22 2014
New Revision: 1599446
URL: http://svn.apache.org/r1599446
Log:
#125003# change LIBRARY path for test run target to use local output dir
Modified:
openoffice/trunk/main/solenv/inc/_tg_app.mk
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=1599446&r1=1599445&r2=1599446&view=diff
==============================================================================
--- openoffice/trunk/main/solenv/inc/_tg_app.mk (original)
+++ openoffice/trunk/main/solenv/inc/_tg_app.mk Tue Jun 3 08:25:22 2014
@@ -283,7 +283,7 @@ $(APP1TARGETN): $(APP1OBJS) $(APP1LIBS)
.IF "$(APP1TEST)" == "enabled" && "$(APP1TARGET)" != ""
$(APP1TARGET)_run: $(APP1TARGETN)
- $(COMMAND_ECHO) $(AUGMENT_LIBRARY_PATH) $(APP1TARGETN)
--gtest_output="xml:$(BIN)/$(APP1TARGET)_result.xml"
+ $(COMMAND_ECHO) $(AUGMENT_LIBRARY_PATH_LOCAL) $(APP1TARGETN)
--gtest_output="xml:$(BIN)/$(APP1TARGET)_result.xml"
.ENDIF
Modified: openoffice/trunk/main/solenv/inc/tg_app.mk
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/solenv/inc/tg_app.mk?rev=1599446&r1=1599445&r2=1599446&view=diff
==============================================================================
--- openoffice/trunk/main/solenv/inc/tg_app.mk (original)
+++ openoffice/trunk/main/solenv/inc/tg_app.mk Tue Jun 3 08:25:22 2014
@@ -285,7 +285,7 @@ $(APP$(TNR)TARGETN): $(APP$(TNR)OBJS) $(
.IF "$(APP$(TNR)TEST)" == "enabled" && "$(APP$(TNR)TARGET)" != ""
$(APP$(TNR)TARGET)_run: $(APP$(TNR)TARGETN)
- $(COMMAND_ECHO) $(AUGMENT_LIBRARY_PATH) $(APP$(TNR)TARGETN)
--gtest_output="xml:$(BIN)/$(APP$(TNR)TARGET)_result.xml"
+ $(COMMAND_ECHO) $(AUGMENT_LIBRARY_PATH_LOCAL) $(APP$(TNR)TARGETN)
--gtest_output="xml:$(BIN)/$(APP$(TNR)TARGET)_result.xml"
.ENDIF
