[Libreoffice-commits] .: 2 commits - configure.in sw/Module_sw.mk

Lubos Lunak llunak at kemper.freedesktop.org
Thu Mar 15 08:06:54 PDT 2012


 configure.in    |    6 ++++--
 sw/Module_sw.mk |    4 ++--
 2 files changed, 6 insertions(+), 4 deletions(-)

New commits:
commit b1c472c7021ebb85afdc5c4afd0e0fcd74ab15d9
Author: Luboš Luňák <l.lunak at suse.cz>
Date:   Thu Mar 15 16:04:12 2012 +0100

    do not leave temporary files after a configure check

diff --git a/configure.in b/configure.in
index f71014d..72b45b9 100644
--- a/configure.in
+++ b/configure.in
@@ -4495,13 +4495,15 @@ struct S2: S1<int> { virtual ~S2(); };
 struct S3: S2 { virtual ~S3(); }; S3::~S3() {}
 _ACEOF
         gccvisinlineshiddenok=yes
-        if ! $CXX $CXXFLAGS $CPPFLAGS -shared -fPIC -fvisibility-inlines-hidden conftestlib1.cc -o lib1.so >/dev/null 2>/dev/null; then
+        if ! $CXX $CXXFLAGS $CPPFLAGS -shared -fPIC -fvisibility-inlines-hidden conftestlib1.cc -o libconftest1.so >/dev/null 2>/dev/null; then
             gccvisinlineshiddenok=no
         else
-            if ! $CXX $CXXFLAGS $CPPFLAGS -shared -fPIC -fvisibility-inlines-hidden conftestlib2.cc -L. -l1 -Wl,-z,defs -o lib2.so >/dev/null 2>/dev/null; then
+            if ! $CXX $CXXFLAGS $CPPFLAGS -shared -fPIC -fvisibility-inlines-hidden conftestlib2.cc -L. -lconftest1 -Wl,-z,defs -o libconftest2.so >/dev/null 2>/dev/null; then
                 gccvisinlineshiddenok=no
             fi
         fi
+        
+        rm -f libconftest1.so libconftest2.so
 
         AC_MSG_RESULT([$gccvisinlineshiddenok])
         if test "$gccvisinlineshiddenok" = "no"; then
commit 2db82ffc1bdd5865e51932930bb5c4688e2de8a3
Author: Luboš Luňák <l.lunak at suse.cz>
Date:   Thu Mar 15 16:00:02 2012 +0100

    these writer unittests surely are slow

diff --git a/sw/Module_sw.mk b/sw/Module_sw.mk
index 6ecc588..8cf4f39 100644
--- a/sw/Module_sw.mk
+++ b/sw/Module_sw.mk
@@ -48,12 +48,12 @@ $(eval $(call gb_Module_add_targets,sw,\
 endif
 
 $(eval $(call gb_Module_add_check_targets,sw,\
-    CppunitTest_sw_filters_test \
-    CppunitTest_sw_macros_test \
     CppunitTest_sw_swdoc_test \
 ))
 
 $(eval $(call gb_Module_add_slowcheck_targets,sw,\
+    CppunitTest_sw_filters_test \
+    CppunitTest_sw_macros_test \
     CppunitTest_sw_subsequent_rtftok \
 ))
 


More information about the Libreoffice-commits mailing list