solenv/bin/unittest-failed.sh | 26 +++++++++++++-------------
1 file changed, 13 insertions(+), 13 deletions(-)
New commits:
commit 09f399d13d65b9aafa3108cb006b55b92d4bbbca
Author: Jan Holesovsky <ke...@collabora.com>
Date: Mon Mar 23 12:39:39 2015 +0100
unittest-failed.sh: Actually just one variable is enough here.
diff --git a/solenv/bin/unittest-failed.sh b/solenv/bin/unittest-failed.sh
index 784a7f9..0d11b2a 100755
--- a/solenv/bin/unittest-failed.sh
+++ b/solenv/bin/unittest-failed.sh
@@ -17,31 +17,31 @@
# except in compliance with the License. You may obtain a copy of
# the License at http://www.apache.org/licenses/LICENSE-2.0 .
-ECHECKING=
DEBUGGING=
-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, and put it to your PATH)'
+ DEBUGGING='
+export CPPUNITTRACE="\"[full path to devenv.exe]\" /debugexe" # for
interactive debugging in Visual Studio
+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'
+ DEBUGGING='
+export CPPUNITTRACE="lldb --" # for interactive debugging on OS X
+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'
+ DEBUGGING='
+export DEBUGCPPUNIT=TRUE # for exception catching
+export CPPUNITTRACE="gdb --args" # for interactive debugging on Linux
+export VALGRIND=memcheck # for memory checking
+'
fi
# print the actual error message
cat << EOF
Error: a unit test failed, please do one of:
-
-$ECHECKING
$DEBUGGING
-$MCHECKING
-
and retry using: make $1Test_$2
EOF
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
