[Libreoffice-commits] buildbot.git: loperf/loperf.sh

[Matúš Kukan]

 loperf/loperf.sh |    5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

New commits:
commit a8cfc20a10a03c0e375cd251850e70904d3fd53b
Author: Matúš Kukan <matus.kukan at collabora.com>
Date:   Fri Mar 28 19:48:37 2014 +0100

    loperf: Fix names of callgrind output files.

diff --git a/loperf/loperf.sh b/loperf/loperf.sh
index 62395f6..b98b6a9 100755
--- a/loperf/loperf.sh
+++ b/loperf/loperf.sh
@@ -68,15 +68,14 @@ function launch {
         valgrind --tool=callgrind --callgrind-out-file="${CG_OUT_FILE}" --simulate-cache=yes --dump-instr=yes --collect-bus=yes --branch-sim=yes "$OFFICEBIN" --splash-pipe=0 --headless > /dev/null 2>&1
         unset OOO_EXIT_POST_STARTUP
     else
+        fn=${1#$DOCUMENTSDIR\/}
+        CG_OUT_FILE="${CG_LOG}-onload-${fn}-${2}.log"
         if test "$2" = "load"; then
             export OOO_EXIT_POST_STARTUP=1
-            CG_OUT_FILE="${CG_LOG}-onload-${fn}-${2}.log"
             valgrind --tool=callgrind --callgrind-out-file="${CG_OUT_FILE}" --simulate-cache=yes --dump-instr=yes --collect-bus=yes --branch-sim=yes "$OFFICEBIN" --splash-pipe=0 --headless "$1" > /dev/null 2>&1
             unset OOO_EXIT_POST_STARTUP
         else
-            fn=${1#$DOCUMENTSDIR\/}
             ext=${fn##*.}
-            CG_OUT_FILE="${CG_LOG}-onload-${fn}-${2}.log"
             valgrind --tool=callgrind --callgrind-out-file="${CG_OUT_FILE}" --simulate-cache=yes --dump-instr=yes --collect-bus=yes --branch-sim=yes "$OFFICEBIN" --splash-pipe=0 --headless --convert-to "$ext" --outdir tmp "$1" > /dev/null 2>&1
         fi
     fi