diff options
| author | Miklos Vajna <vmiklos@collabora.co.uk> | 2014-12-07 19:24:00 +0100 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@collabora.co.uk> | 2014-12-07 19:24:00 +0100 |
| commit | 8414b65053dc2914e81a93d9ccd0653ffeea5f2c (patch) | |
| tree | 5469b1e310dbfe1b1e307d47d3fbac37722e6114 /solenv | |
| parent | 365116a45dd93372a382521747c6eca882306ef3 (diff) | |
solenv: no need to advertise lldb/devenv on Linux in unittest-failed.sh
Change-Id: I1dd1b7804defdf363599c17dee3ab1333cf46ee7
Diffstat (limited to 'solenv')
| -rwxr-xr-x | solenv/bin/unittest-failed.sh | 14 | ||||
| -rw-r--r-- | solenv/gbuild/CppunitTest.mk | 2 |
2 files changed, 14 insertions, 2 deletions
diff --git a/solenv/bin/unittest-failed.sh b/solenv/bin/unittest-failed.sh index b49ddd765536..277c908a6345 100755 --- a/solenv/bin/unittest-failed.sh +++ b/solenv/bin/unittest-failed.sh @@ -22,9 +22,21 @@ cat << EOF Error: a unit test failed, please do one of: export DEBUGCPPUNIT=TRUE # for exception catching -export CPPUNITTRACE="gdb --args" # for interactive debugging on Linux +EOF +if [ "$3" == "WNT" ]; then +cat << EOF export CPPUNITTRACE="\"[full path to devenv.exe]\" /debugexe" # for interactive debugging in Visual Studio +EOF +elif [ "$3" == "MACOSX" ]; then +cat << EOF export CPPUNITTRACE="lldb --" # for interactive debugging on OSX +EOF +else +cat << EOF +export CPPUNITTRACE="gdb --args" # for interactive debugging on Linux +EOF +fi +cat << EOF export VALGRIND=memcheck # for memory checking and retry using: make $1Test_$2 diff --git a/solenv/gbuild/CppunitTest.mk b/solenv/gbuild/CppunitTest.mk index 4e3d54aac6d4..47f1110d078b 100644 --- a/solenv/gbuild/CppunitTest.mk +++ b/solenv/gbuild/CppunitTest.mk @@ -101,7 +101,7 @@ $(call gb_CppunitTest_get_target,%) :| $(gb_CppunitTest_CPPTESTDEPS) || ($(if $(value gb_CppunitTest_postprocess), \ RET=$$?; \ $(call gb_CppunitTest_postprocess,$(gb_CppunitTest_CPPTESTCOMMAND),$@.core,$$RET) >> $@.log 2>&1;) \ - cat $@.log; $(SRCDIR)/solenv/bin/unittest-failed.sh Cppunit $*)))) + cat $@.log; $(SRCDIR)/solenv/bin/unittest-failed.sh Cppunit $* $(OS))))) define gb_CppunitTest_CppunitTest $(call gb_CppunitTest__CppunitTest_impl,$(1),$(call gb_CppunitTest_get_linktarget,$(1))) |