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

[Noel Grandin (via logerrit)]

 solenv/bin/lldb-core-bt.sh       |   50 ---------------------------------------
 solenv/gbuild/platform/macosx.mk |    3 --
 2 files changed, 53 deletions(-)

New commits:
commit 43d9959b9165faa4d67618774736b03ce60253ab
Author:     Noel Grandin <noel.grandin at collabora.co.uk>
AuthorDate: Tue Jun 9 13:37:22 2020 +0200
Commit:     Noel Grandin <noel.grandin at collabora.co.uk>
CommitDate: Wed Jun 10 09:47:44 2020 +0200

    Revert "enable backtraces for unit tests on macos"
    
    This reverts commit 756c027198adc5212d46d72e0628c90698652af5.
    
    Reason for revert: It never did work (was a test), and it cannot work because cores are all stored in /cores under mac, which means we cannot tell which cores belongs to which unit tests, or even if it belongs to the current build on jenkins
    
    Change-Id: I866173a41077dbb40d61fb81953d7a92f7d0789e
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/95888
    Tested-by: Noel Grandin <noel.grandin at collabora.co.uk>
    Reviewed-by: Noel Grandin <noel.grandin at collabora.co.uk>

diff --git a/solenv/bin/lldb-core-bt.sh b/solenv/bin/lldb-core-bt.sh
deleted file mode 100755
index def4a8939db0..000000000000
--- a/solenv/bin/lldb-core-bt.sh
+++ /dev/null
@@ -1,50 +0,0 @@
-#!/bin/sh
-#
-#
-# This file is part of the LibreOffice project.
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-#
-#
-
-EXECUTABLE=${1}
-COREDIR=${2}
-EXITCODE=${3}
-
-if test -n "$(which lldb)"
-then
-    found=
-    for COREFILE in "$COREDIR"/core*
-    do
-        if [ -f "$COREFILE" ]
-        then
-            guess=$(file "$COREFILE")
-            guess=${guess#* execfn: \'}
-            guess=${guess%%\'*}
-            if [ ! -x "$guess" ]; then guess=$EXECUTABLE; fi
-            printf '\nIt looks like %s generated %s\nBacktraces:\n' \
-                "$guess" "$COREFILE"
-            $LLDBCOMMANDFILE=$(mktemp)
-            printf "target create -c $COREFILE $guess\nthread backtrace all\nquit\n" >"$LLDBCOMMANDFILE"
-            lldb -s "$LLDBCOMMANDFILE" --batch \
-                && found=x
-            rm "$LLDBCOMMANDFILE"
-            echo
-        fi
-    done
-    if [ -z "$found" -a "$EXITCODE" -ge 128 ]; then
-        echo
-        echo "No core file identified in directory ${COREDIR}"
-        echo "To show backtraces for crashes during test execution,"
-        echo "enable core files with:"
-        echo
-        echo "   ulimit -c unlimited"
-        echo
-        exit 1
-    fi
-else
-    echo "You need lldb in your path to show backtraces"
-    exit 1
-fi
diff --git a/solenv/gbuild/platform/macosx.mk b/solenv/gbuild/platform/macosx.mk
index f9a805b6b62e..c743511207ce 100644
--- a/solenv/gbuild/platform/macosx.mk
+++ b/solenv/gbuild/platform/macosx.mk
@@ -266,10 +266,7 @@ gb_CppunitTest_malloc_check := MallocScribble=1 MallocPreScribble=1
 define gb_CppunitTest_CppunitTest_platform
 $(call gb_LinkTarget_get_target,$(2)) : RPATH :=
 $(call gb_LinkTarget_get_target,$(2)) : LAYER := NONE
-endef
 
-define gb_CppunitTest_postprocess
-$(SRCDIR)/solenv/bin/lldb-core-bt.sh $(1) $(2) $(3)
 endef
 
 # JunitTest class