[Libreoffice-commits] core.git: Branch 'libreoffice-4-1' - 2 commits - solenv/gbuild sw/qa

[Miklos Vajna]

 solenv/gbuild/AllLangResTarget.mk    |    3 ++-
 sw/qa/extras/inc/swmodeltestbase.hxx |    2 ++
 2 files changed, 4 insertions(+), 1 deletion(-)

New commits:
commit aa990e919a021a8c8349b029a00c36be1fd0e112
Author: Miklos Vajna <vmiklos at suse.cz>
Date:   Sun Jun 16 11:13:30 2013 +0200

    SwModelTestBase: fix for leaking temporary files
    
    This alone pushes down the number of created /tmp/lu* from 527 to 2
    after a single run. Regression from
    9b53538a076a2370df975655c8579dfe09cff09b.
    
    Change-Id: I5ea2e3da0b89223fb32469af3d59a2a3b246d00f
    Helped-by: Markus Mohrhard <markus.mohrhard at googlemail.com>
    Signed-off-by: Luboš Luňák <l.lunak at suse.cz>

diff --git a/sw/qa/extras/inc/swmodeltestbase.hxx b/sw/qa/extras/inc/swmodeltestbase.hxx
index 3f0fab8..5963a1b 100644
--- a/sw/qa/extras/inc/swmodeltestbase.hxx
+++ b/sw/qa/extras/inc/swmodeltestbase.hxx
@@ -264,6 +264,8 @@ protected:
 
     void load(const char* pDir, const char* pName, bool bCalcLayout = true)
     {
+        if (mxComponent.is())
+            mxComponent->dispose();
         // Output name early, so in the case of a hang, the name of the hanging input file is visible.
         fprintf(stderr, "%s,", pName);
         m_nStartTime = osl_getGlobalTimer();
commit b5fc4b0ca32d97348df0c427852cb02c8b778be5
Author: Khaled Hosny <khaledhosny at eglug.org>
Date:   Thu Jun 27 21:12:56 2013 +0200

    Remove temporary files
    
    No more gbuild.XXXXXX files filling /tmp
    
    Change-Id: I2f3cd388ccd9a09bc72e40c0d43d845bc8e38cd7
    Signed-off-by: Luboš Luňák <l.lunak at suse.cz>

diff --git a/solenv/gbuild/AllLangResTarget.mk b/solenv/gbuild/AllLangResTarget.mk
index 01c93f8..6d1b47d 100644
--- a/solenv/gbuild/AllLangResTarget.mk
+++ b/solenv/gbuild/AllLangResTarget.mk
@@ -229,7 +229,8 @@ $(call gb_Output_announce,SRS:$(2),$(true),DEP,1)
 $(call gb_Helper_abbreviate_dirs,\
 	mkdir -p $(dir $(1)) && \
 	RESPONSEFILE=$(call var2file,$(shell $(gb_MKTEMP)),200,$(3)) && \
-	$(call gb_Executable_get_command,concat-deps) $${RESPONSEFILE} > $(1))
+	$(call gb_Executable_get_command,concat-deps) $${RESPONSEFILE} > $(1)) && \
+	rm -f $${RESPONSEFILE}
 endef
 endif