[Libreoffice-commits] core.git: 2 commits - solenv/bin

Jan Holesovsky kendy at collabora.com
Mon Mar 23 04:32:01 PDT 2015


 solenv/bin/unittest-failed.sh |   10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

New commits:
commit 5106150a164383613981caed02dbb878efe9335a
Author: Jan Holesovsky <kendy at collabora.com>
Date:   Mon Mar 23 12:28:23 2015 +0100

    It's good to have Dr.Memory in your PATH.

diff --git a/solenv/bin/unittest-failed.sh b/solenv/bin/unittest-failed.sh
index 326355b..784a7f9 100755
--- a/solenv/bin/unittest-failed.sh
+++ b/solenv/bin/unittest-failed.sh
@@ -23,7 +23,7 @@ MCHECKING=
 
 if [ "$3" = "WNT" ]; then
     DEBUGGING='export CPPUNITTRACE="\"[full path to devenv.exe]\" /debugexe" # for interactive debugging in Visual Studio'
-    MCHECKING='export CPPUNITTRACE="drmemory -free_max_frames 20"            # for memory checking (install Dr.Memory first)'
+    MCHECKING='export CPPUNITTRACE="drmemory -free_max_frames 20"            # for memory checking (install Dr.Memory first, and put it to your PATH)'
 elif [ "$3" = "MACOSX" ]; then
     DEBUGGING='export CPPUNITTRACE="lldb --"       # for interactive debugging on OS X'
     MCHECKING='export VALGRIND=memcheck            # for memory checking'
commit 98b3680f795b3257a5ac1f1c4e618d3f82b4518f
Author: Jan Holesovsky <kendy at collabora.com>
Date:   Mon Mar 23 12:27:31 2015 +0100

    DEBUGCPPUNIT makes no sense on Windows and OS X.

diff --git a/solenv/bin/unittest-failed.sh b/solenv/bin/unittest-failed.sh
index b1e93d5..326355b 100755
--- a/solenv/bin/unittest-failed.sh
+++ b/solenv/bin/unittest-failed.sh
@@ -17,18 +17,20 @@
 #   except in compliance with the License. You may obtain a copy of
 #   the License at http://www.apache.org/licenses/LICENSE-2.0 .
 
-ECHECKING='export DEBUGCPPUNIT=TRUE            # for exception catching'
+ECHECKING=
 DEBUGGING=
-MCHECKING='export VALGRIND=memcheck            # for memory checking'
+MCHECKING=
 
 if [ "$3" = "WNT" ]; then
-    ECHECKING='export DEBUGCPPUNIT=TRUE                                      # for exception catching'
     DEBUGGING='export CPPUNITTRACE="\"[full path to devenv.exe]\" /debugexe" # for interactive debugging in Visual Studio'
     MCHECKING='export CPPUNITTRACE="drmemory -free_max_frames 20"            # for memory checking (install Dr.Memory first)'
 elif [ "$3" = "MACOSX" ]; then
     DEBUGGING='export CPPUNITTRACE="lldb --"       # for interactive debugging on OS X'
+    MCHECKING='export VALGRIND=memcheck            # for memory checking'
 else
+    ECHECKING='export DEBUGCPPUNIT=TRUE            # for exception catching'
     DEBUGGING='export CPPUNITTRACE="gdb --args"    # for interactive debugging on Linux'
+    MCHECKING='export VALGRIND=memcheck            # for memory checking'
 fi
 
 # print the actual error message


More information about the Libreoffice-commits mailing list