diff --git a/scripts/contrib/build-perf-test.sh b/scripts/contrib/build-perf-test.sh index 44a902c135..f48220a3c3 100755 --- a/scripts/contrib/build-perf-test.sh +++ b/scripts/contrib/build-perf-test.sh @@ -257,36 +257,36 @@ do_sync () { # - report size, remove INHERIT test1_p1 () { -log "Running Test 1, part 1/3: Measure wall clock of bitbake $IMAGE and size of tmp/ dir" -bbnotime "$IMAGE -c fetchall" -do_rmtmp -do_rmsstate -do_sync -bbtime "$IMAGE" -log "SIZE of tmp dir is: `du -sh tmp | sed 's/tmp//'`" -log "Buildstats are saved in $OUTDIR/buildstats-test1" -mv tmp/buildstats $OUTDIR/buildstats-test1 + log "Running Test 1, part 1/3: Measure wall clock of bitbake $IMAGE and size of tmp/ dir" + bbnotime "$IMAGE -c fetchall" + do_rmtmp + do_rmsstate + do_sync + bbtime "$IMAGE" + log "SIZE of tmp dir is: `du -sh tmp | sed 's/tmp//'`" + log "Buildstats are saved in $OUTDIR/buildstats-test1" + mv tmp/buildstats $OUTDIR/buildstats-test1 } test1_p2 () { -log "Running Test 1, part 2/3: bitbake virtual/kernel -c cleansstate and time bitbake virtual/kernel" -bbnotime "virtual/kernel -c cleansstate" -do_sync -bbtime "virtual/kernel" + log "Running Test 1, part 2/3: bitbake virtual/kernel -c cleansstate and time bitbake virtual/kernel" + bbnotime "virtual/kernel -c cleansstate" + do_sync + bbtime "virtual/kernel" } test1_p3 () { -log "Running Test 1, part 3/3: Build $IMAGE w/o sstate and report size of tmp/dir with rm_work enabled" -echo "INHERIT += \"rm_work\"" >> conf/local.conf -do_rmtmp -do_rmsstate -do_sync -bbtime "$IMAGE" -sed -i 's/INHERIT += \"rm_work\"//' conf/local.conf -log "SIZE of tmp dir is: `du -sh tmp | sed 's/tmp//'`" -log "Buildstats are saved in $OUTDIR/buildstats-test13" -mv tmp/buildstats $OUTDIR/buildstats-test13 + log "Running Test 1, part 3/3: Build $IMAGE w/o sstate and report size of tmp/dir with rm_work enabled" + echo "INHERIT += \"rm_work\"" >> conf/local.conf + do_rmtmp + do_rmsstate + do_sync + bbtime "$IMAGE" + sed -i 's/INHERIT += \"rm_work\"//' conf/local.conf + log "SIZE of tmp dir is: `du -sh tmp | sed 's/tmp//'`" + log "Buildstats are saved in $OUTDIR/buildstats-test13" + mv tmp/buildstats $OUTDIR/buildstats-test13 } @@ -296,11 +296,11 @@ mv tmp/buildstats $OUTDIR/buildstats-test13 # Pre: populated sstate cache test2 () { -#assuming test 1 has run -log "Running Test 2: Measure wall clock of bitbake $IMAGE -c rootfs with sstate" -do_rmtmp -do_sync -bbtime "$IMAGE -c rootfs" + # Assuming test 1 has run + log "Running Test 2: Measure wall clock of bitbake $IMAGE -c rootfs with sstate" + do_rmtmp + do_sync + bbtime "$IMAGE -c rootfs" } @@ -314,14 +314,14 @@ bbtime "$IMAGE -c rootfs" test3 () { -log "Running Test 3: Parsing time metrics (bitbake -p)" -log " Removing tmp/cache && cache" -rm -rf tmp/cache cache -bbtime "-p" -log " Removing tmp/cache/default-eglibc/" -rm -rf tmp/cache/default-eglibc/ -bbtime "-p" -bbtime "-p" + log "Running Test 3: Parsing time metrics (bitbake -p)" + log " Removing tmp/cache && cache" + rm -rf tmp/cache cache + bbtime "-p" + log " Removing tmp/cache/default-eglibc/" + rm -rf tmp/cache/default-eglibc/ + bbtime "-p" + bbtime "-p" }