[buildstream] 01/01: Fix infinite recursion in default strip debug command

[gi...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

github-bot pushed a commit to branch valentindavid/fix-recursive-strip-debug-1.2
in repository https://gitbox.apache.org/repos/asf/buildstream.git

commit 76c26d0b894fa4ef66665b1732c965ea2bbf5be7
Author: Valentin David <va...@codethink.co.uk>
AuthorDate: Thu Nov 1 12:17:35 2018 +0100

    Fix infinite recursion in default strip debug command
    
    Fixes #645.
---
 buildstream/data/projectconfig.yaml             | 5 +++++
 tests/cachekey/project/elements/build1.expected | 2 +-
 tests/cachekey/project/elements/build2.expected | 2 +-
 tests/cachekey/project/target.expected          | 2 +-
 4 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/buildstream/data/projectconfig.yaml b/buildstream/data/projectconfig.yaml
index 247a453..1010caf 100644
--- a/buildstream/data/projectconfig.yaml
+++ b/buildstream/data/projectconfig.yaml
@@ -63,6 +63,11 @@ variables:
           -o -name '*.cmxs' -o -name '*.node' ')' \
       -exec sh -ec \
       'read -n4 hdr <"$1" # check for elf header
+       case "$1" in
+         %{install-root}%{debugdir}/*)
+           exit 0
+           ;;
+       esac
        if [ "$hdr" != "$(printf \\x7fELF)" ]; then
            exit 0
        fi
diff --git a/tests/cachekey/project/elements/build1.expected b/tests/cachekey/project/elements/build1.expected
index 750d062..bfe2302 100644
--- a/tests/cachekey/project/elements/build1.expected
+++ b/tests/cachekey/project/elements/build1.expected
@@ -1 +1 @@
-afab4c1a67d1e06489083fa1559bda0b2c8df9b7bc239820ed7cdab30c988a4e
\ No newline at end of file
+b091247326a9d4a913011a66304c456f27f023a43c8c2e9fd92d16b03b48d1dd
\ No newline at end of file
diff --git a/tests/cachekey/project/elements/build2.expected b/tests/cachekey/project/elements/build2.expected
index 3b40d2d..47d75d0 100644
--- a/tests/cachekey/project/elements/build2.expected
+++ b/tests/cachekey/project/elements/build2.expected
@@ -1 +1 @@
-47395a4e6c86372b181ad1fd6443e11b1ab54c480b7be5e5fe816d84eec3b369
\ No newline at end of file
+228a520e48f44465733a9d0e9e7fa7c0694f9983a42c372bff2a182bced98678
\ No newline at end of file
diff --git a/tests/cachekey/project/target.expected b/tests/cachekey/project/target.expected
index 5fcd894..21f24dd 100644
--- a/tests/cachekey/project/target.expected
+++ b/tests/cachekey/project/target.expected
@@ -1 +1 @@
-46f48e5c0ff52370ff0cf2bb23bd2c79da23141e6c17b9aa720f7d97b7194340
\ No newline at end of file
+af7910519ec114a78869df2588757073ef15ffc28532ea1b0f46f16451b0fb75
\ No newline at end of file