summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristophe Lyon <christophe.lyon@linaro.org>2019-01-18 16:16:57 +0000
committerChristophe Lyon <christophe.lyon@linaro.org>2019-01-25 15:09:44 +0000
commit3fc3100497de6c8887e3a1d815cd2b8227207352 (patch)
tree5737e217aa7bf9b9deafbb03e1f53b6f17bae272
parent564022aa3fe12887498df178a1947ea61c9c8d67 (diff)
tcwg-benchmark.sh: Add support for :parallelize parameter in ccprefix.
We just need to keep this parameter if present, and pass it to run.sh unchanged. Just take care that the path component in a ssh:// toolchain is always the last one. Change-Id: I581af110e4df06adce5fcdfb3ae722ea74fc6451
-rwxr-xr-xtcwg-benchmark.sh7
1 files changed, 5 insertions, 2 deletions
diff --git a/tcwg-benchmark.sh b/tcwg-benchmark.sh
index 0b1e125e..a544a5f0 100755
--- a/tcwg-benchmark.sh
+++ b/tcwg-benchmark.sh
@@ -46,7 +46,9 @@ case "$toolchain_url" in
"ssh://"*)
ccprefix="${toolchain_url##ssh://}"
- # Extract host:port: specification from ccprefix.
+ # Extract host:port: specification from ccprefix, we don't
+ # need to care about :parallelize here, just pass it to run.sh
+ # if present.
case ${ccprefix} in
*:*:*)
build=${ccprefix%:*}
@@ -92,7 +94,8 @@ case "$toolchain_url" in
echo "ERROR: Unsupported sysroot $sysroot for toolchain_url $toolchain_url"
exit 1
fi
- toolchaindir="$(dirname $(echo $ccprefix | cut -s -d: -f 3))"
+ # Last component of ccprefix is the path, keep it
+ toolchaindir="$(dirname ${ccprefix##*:})"
;;
"http://"*".tar.xz"|"https://"*".tar.xz")
toolchaindir=$(untar_url "$toolchain_url" "$WORKSPACE" "--strip-components 1")