Patchwork [1/1] bb-matrix: correct BB and PM number canonicalization

login
register
mail settings
Submitter Darren Hart
Date July 14, 2011, 9:05 p.m.
Message ID <3e0a1eff55415a317e061a39af7e81f7b9aae30e.1310677351.git.dvhart@linux.intel.com>
Download mbox | patch
Permalink /patch/7611/
State New, archived
Headers show

Comments

Darren Hart - July 14, 2011, 9:05 p.m.
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.

Signed-off-by: Darren Hart <dvhart@linux.intel.com>
---
 scripts/contrib/bb-perf/bb-matrix.sh |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

Patch

diff --git a/scripts/contrib/bb-perf/bb-matrix.sh b/scripts/contrib/bb-perf/bb-matrix.sh
index 64d5513..b9edd5f 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)"