scripts/contrib/build-perf-test.sh: fix passing arguments
Don't pass arguments to bitbake as a single one, because this will break when the bitbake double-exec is removed. (From OE-Core rev: db13f10d233873148156880ab709ec76f8d3c329) Signed-off-by: Stefan Stanacar <stefanx.stanacar@intel.com> Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
parent
b7308e7814
commit
30d3c8d11e
|
@ -180,12 +180,13 @@ declare -a SIZES
|
|||
size_count=0
|
||||
|
||||
bbtime () {
|
||||
log " Timing: bitbake $1"
|
||||
local arg="$@"
|
||||
log " Timing: bitbake ${arg}"
|
||||
|
||||
if [ $verbose -eq 0 ]; then
|
||||
/usr/bin/time -v -o $resultsfile bitbake "$1" >> $bboutput
|
||||
/usr/bin/time -v -o $resultsfile bitbake ${arg} >> $bboutput
|
||||
else
|
||||
/usr/bin/time -v -o $resultsfile bitbake "$1"
|
||||
/usr/bin/time -v -o $resultsfile bitbake ${arg}
|
||||
fi
|
||||
ret=$?
|
||||
if [ $ret -eq 0 ]; then
|
||||
|
@ -206,18 +207,19 @@ bbtime () {
|
|||
|
||||
#we don't time bitbake here
|
||||
bbnotime () {
|
||||
log " Running: bitbake $1"
|
||||
local arg="$@"
|
||||
log " Running: bitbake ${arg}"
|
||||
if [ $verbose -eq 0 ]; then
|
||||
bitbake "$1" >> $bboutput
|
||||
bitbake ${arg} >> $bboutput
|
||||
else
|
||||
bitbake "$1"
|
||||
bitbake ${arg}
|
||||
fi
|
||||
ret=$?
|
||||
if [ $ret -eq 0 ]; then
|
||||
log " Finished bitbake $1"
|
||||
log " Finished bitbake ${arg}"
|
||||
else
|
||||
log "ERROR: exit status was non-zero. Exit.."
|
||||
exit $?
|
||||
exit $ret
|
||||
fi
|
||||
|
||||
}
|
||||
|
@ -277,11 +279,11 @@ write_results() {
|
|||
|
||||
test1_p1 () {
|
||||
log "Running Test 1, part 1/3: Measure wall clock of bitbake $IMAGE and size of tmp/ dir"
|
||||
bbnotime "$IMAGE -c fetchall"
|
||||
bbnotime $IMAGE -c fetchall
|
||||
do_rmtmp
|
||||
do_rmsstate
|
||||
do_sync
|
||||
bbtime "$IMAGE"
|
||||
bbtime $IMAGE
|
||||
s=`du -sh tmp | sed 's/tmp//'`
|
||||
SIZES[(( size_count++ ))]="$s"
|
||||
log "SIZE of tmp dir is: $s"
|
||||
|
@ -292,9 +294,9 @@ test1_p1 () {
|
|||
|
||||
test1_p2 () {
|
||||
log "Running Test 1, part 2/3: bitbake virtual/kernel -c cleansstate and time bitbake virtual/kernel"
|
||||
bbnotime "virtual/kernel -c cleansstate"
|
||||
bbnotime virtual/kernel -c cleansstate
|
||||
do_sync
|
||||
bbtime "virtual/kernel"
|
||||
bbtime virtual/kernel
|
||||
}
|
||||
|
||||
test1_p3 () {
|
||||
|
@ -303,7 +305,7 @@ test1_p3 () {
|
|||
do_rmtmp
|
||||
do_rmsstate
|
||||
do_sync
|
||||
bbtime "$IMAGE"
|
||||
bbtime $IMAGE
|
||||
sed -i 's/INHERIT += \"rm_work\"//' conf/local.conf
|
||||
s=`du -sh tmp | sed 's/tmp//'`
|
||||
SIZES[(( size_count++ ))]="$s"
|
||||
|
@ -323,7 +325,7 @@ test2 () {
|
|||
log "Running Test 2: Measure wall clock of bitbake $IMAGE -c rootfs with sstate"
|
||||
do_rmtmp
|
||||
do_sync
|
||||
bbtime "$IMAGE -c rootfs"
|
||||
bbtime $IMAGE -c rootfs
|
||||
}
|
||||
|
||||
|
||||
|
@ -340,11 +342,11 @@ test3 () {
|
|||
log "Running Test 3: Parsing time metrics (bitbake -p)"
|
||||
log " Removing tmp/cache && cache"
|
||||
rm -rf tmp/cache cache
|
||||
bbtime "-p"
|
||||
bbtime -p
|
||||
log " Removing tmp/cache/default-eglibc/"
|
||||
rm -rf tmp/cache/default-eglibc/
|
||||
bbtime "-p"
|
||||
bbtime "-p"
|
||||
bbtime -p
|
||||
bbtime -p
|
||||
}
|
||||
|
||||
|
||||
|
|
Loading…
Reference in New Issue