aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMaxim Kuvyrkov <maxim.kuvyrkov@linaro.org>2020-12-01 09:01:30 +0000
committerMaxim Kuvyrkov <maxim.kuvyrkov@linaro.org>2020-12-01 09:01:30 +0000
commit1ec6f4c34da54c60b8c017e4eeea9822f2caa74a (patch)
tree5341f140413b3e53ca4afbd6fb47363911960f0c
parent12c00a3039aab006db2ea977ee65ea08d6b8e0ae (diff)
test-manifest2.sh: Better handle subcomponents in check_revisions_in_manifest
... now that we use gdbserver as subcomponent to itself. Change-Id: I673efcf620c98e80047884c877d421c4567cc831
-rwxr-xr-xtest-manifest2.sh5
1 files changed, 4 insertions, 1 deletions
diff --git a/test-manifest2.sh b/test-manifest2.sh
index 4539352..6452f32 100755
--- a/test-manifest2.sh
+++ b/test-manifest2.sh
@@ -176,7 +176,10 @@ check_revisions_in_manifest()
REPORT=$4
FAILED=false
while read; do
- COMPONENT=`echo "$REPLY" | sed -e 's/:.*//; s/gcc stage[12]/gcc/'`
+ # We get input in the form:
+ # COMPONENT[optional SUBCOMPONENT]: REPO.git SHA1
+ # Extract COMPONENT:
+ COMPONENT=`echo "$REPLY" | sed -e 's/:.*//; s/ .*//'`
REV=`echo $REPLY | sed -e 's/.* //'`
if ! grep -q "${COMPONENT}_revision=$REV" "$MANI"; then
FAILED=true