[Libreoffice-commits] core.git: solenv/gbuild

Laurent Godard lgodard.libre at laposte.net
Mon Oct 13 03:46:31 PDT 2014


 solenv/gbuild/CppunitTest.mk |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit b1e9163b5929f68860b56b04112fb76d303f6388
Author: Laurent Godard <lgodard.libre at laposte.net>
Date:   Mon Oct 13 11:50:39 2014 +0200

    enhance perfcheck failing message
    
    add the expected number
    
    Change-Id: Ib068288f7efbfebc2705c6084dc34a651def1986
    Reviewed-on: https://gerrit.libreoffice.org/11948
    Reviewed-by: Matúš Kukan <matus.kukan at collabora.com>
    Tested-by: Matúš Kukan <matus.kukan at collabora.com>

diff --git a/solenv/gbuild/CppunitTest.mk b/solenv/gbuild/CppunitTest.mk
index d79e1ce..3c5f11c 100644
--- a/solenv/gbuild/CppunitTest.mk
+++ b/solenv/gbuild/CppunitTest.mk
@@ -96,7 +96,7 @@ $(call gb_CppunitTest_get_target,%) :| $(gb_CppunitTest_CPPTESTDEPS)
 					$(call gb_CppunitTest_postprocess,$(gb_CppunitTest_CPPTESTCOMMAND),$@.core,$$RET) >> $@.log 2>&1;) \
 				cat $@.log; $(SRCDIR)/solenv/bin/unittest-failed.sh Cppunit $*))) \
 		$(if $(PERFTEST), && VAL=$$(grep '^==.*== Collected : ' $@.log | sed "s/==.*== Collected : //") && \
-			$(if $(filter 0,$(PERFTEST)), expr "$$VAL" "*" "101" "/" "100", test $$VAL -le $(PERFTEST) || (echo "Unit test is slow! $$VAL instructions detected." && false))) \
+			$(if $(filter 0,$(PERFTEST)), expr "$$VAL" "*" "101" "/" "100", test $$VAL -le $(PERFTEST) || (echo "Unit test is slow! $$VAL instructions detected (expected $(PERFTEST))." && false))) \
 	)
 
 define gb_CppunitTest_CppunitTest


More information about the Libreoffice-commits mailing list