[Libreoffice-commits] .: 2 commits - solenv/inc sw/qa

[Markus Mohrhard]

 solenv/inc/gbuildbridge.mk     |    4 ++--
 sw/qa/extras/rtftok/rtftok.cxx |    2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

New commits:
commit 83561ac5bb5200ec87183a951445d9592c37e888
Author: Markus Mohrhard <markus.mohrhard at googlemail.com>
Date:   Sun Mar 25 16:31:42 2012 +0200

    disable failing test
    
    missing test document

diff --git a/sw/qa/extras/rtftok/rtftok.cxx b/sw/qa/extras/rtftok/rtftok.cxx
index 472e775..59390a5 100644
--- a/sw/qa/extras/rtftok/rtftok.cxx
+++ b/sw/qa/extras/rtftok/rtftok.cxx
@@ -89,7 +89,7 @@ public:
     CPPUNIT_TEST(testN751020);
     CPPUNIT_TEST(testFdo47326);
     CPPUNIT_TEST(testFdo47036);
-    CPPUNIT_TEST(testFdo46955);
+    //CPPUNIT_TEST(testFdo46955);
 #endif
     CPPUNIT_TEST_SUITE_END();
 
commit b566229371cb72aaa4511fdaee0b50ce89423095
Author: Matúš Kukan <matus.kukan at gmail.com>
Date:   Sun Mar 25 16:31:16 2012 +0200

    enable slowcheck for top level make all again

diff --git a/solenv/inc/gbuildbridge.mk b/solenv/inc/gbuildbridge.mk
index b9b1264..529d6e2 100644
--- a/solenv/inc/gbuildbridge.mk
+++ b/solenv/inc/gbuildbridge.mk
@@ -34,8 +34,8 @@ TARGET=prj
 all:
 .ELIF "$(VERBOSE)"!=""
 all:
-	cd $(PRJ) && $(GNUMAKE) -r -j$(GMAKE_MODULE_PARALLELISM)
+	cd $(PRJ) && $(GNUMAKE) -r -j$(GMAKE_MODULE_PARALLELISM) all slowcheck
 .ELSE
 all:
-	@cd $(PRJ) && $(GNUMAKE) -rs -j$(GMAKE_MODULE_PARALLELISM)
+	@cd $(PRJ) && $(GNUMAKE) -rs -j$(GMAKE_MODULE_PARALLELISM) all slowcheck
 .END