summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDarren Hart <dvhart@linux.intel.com>2011-07-14 14:05:42 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2011-07-14 22:23:09 +0100
commitfa4bcfdb73167f8159b88e5a4d711c0d37627a70 (patch)
tree9b678a5320cb8964489b7b0a302ed36923500d7a
parentf7fd215749e12852378a3a1cce7d316078ead54d (diff)
downloadpoky-fa4bcfdb73167f8159b88e5a4d711c0d37627a70.tar.gz
poky-fa4bcfdb73167f8159b88e5a4d711c0d37627a70.tar.bz2
poky-fa4bcfdb73167f8159b88e5a4d711c0d37627a70.zip
bb-matrix: correct BB and PM number canonicalization
The bash string operation ${BB##*0} was greedy and in addition to converting "02" to "2", also converted "20" to "", causing all builds for a BB value ending in 0 to run with BB_NUMBER_THREADS=1. (From OE-Core rev: b975de5ea76c5f8827fb48c0c3c29902872ad3d6) Signed-off-by: Darren Hart <dvhart@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rwxr-xr-xscripts/contrib/bb-perf/bb-matrix.sh4
1 files changed, 2 insertions, 2 deletions
diff --git a/scripts/contrib/bb-perf/bb-matrix.sh b/scripts/contrib/bb-perf/bb-matrix.sh
index 64d55137c8..b9edd5ff08 100755
--- a/scripts/contrib/bb-perf/bb-matrix.sh
+++ b/scripts/contrib/bb-perf/bb-matrix.sh
@@ -62,8 +62,8 @@ for BB in $BB_RANGE; do
echo "BB=$BB PM=$PM Logging to $BB_LOG"
# Export the variables under test and run the bitbake command
- export BB_NUMBER_THREADS="${BB##*0}"
- export PARALLEL_MAKE="-j ${PM##*0}"
+ export BB_NUMBER_THREADS=$(echo $BB | sed 's/^0*//')
+ export PARALLEL_MAKE="-j $(echo $PM | sed 's/^0*//')"
/usr/bin/time -f "$BB $PM $TIME_STR" -a -o $RUNTIME_LOG $BB_CMD &> $BB_LOG
echo " $(tail -n1 $RUNTIME_LOG)"