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

[Matúš Kukan]

 loperf/loperf.sh |   26 +++++++++++++++-----------
 1 file changed, 15 insertions(+), 11 deletions(-)

New commits:
commit c201fa0f6f1776749db0d47f72653670e40552fd
Author: Matúš Kukan <matus.kukan at collabora.com>
Date:   Tue Dec 10 09:34:06 2013 +0100

    loperf: Check also export by adding --convert-to.

diff --git a/loperf/loperf.sh b/loperf/loperf.sh
index 924c8df..2942358 100755
--- a/loperf/loperf.sh
+++ b/loperf/loperf.sh
@@ -40,7 +40,6 @@ if test $(compareversion "$(valgrind --version)" "$REQUIRED_VALGRIND_VERSION") -
 fi
 
 # Post dependency check
-export OOO_EXIT_POST_STARTUP=1
 export OOO_DISABLE_RECOVERY=1
 OFFICEBIN="$1"
 VALGRIND_PARAMS="$2"
@@ -65,11 +64,14 @@ test -f "$CSV_HISTORY" || echo -e "time,git-commit,offload$(ls docs/* | sed s%do
 function launch {
 
     if test "$1" = ""; then
+        export OOO_EXIT_POST_STARTUP=1
         valgrind --tool=callgrind $VALGRIND_PARAMS --callgrind-out-file="$CG_LOG"-offload.log --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
         echo -n "$CG_LOG"-offload.log
     else
         fn=${1#docs\/}
-        valgrind --tool=callgrind $VALGRIND_PARAMS --callgrind-out-file="$CG_LOG"-onload-"$fn".log --simulate-cache=yes --dump-instr=yes --collect-bus=yes --branch-sim=yes "$OFFICEBIN" "$1" --splash-pipe=0 --headless > /dev/null 2>&1
+        ext=${fn##*.}
+        valgrind --tool=callgrind $VALGRIND_PARAMS --callgrind-out-file="$CG_LOG"-onload-"$fn".log --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
         echo -n "$CG_LOG"-onload-"$fn".log
     fi
 }
commit fc795037077a7b021b3f7bd52ad6cd9a28208d1e
Author: Matúš Kukan <matus.kukan at collabora.com>
Date:   Tue Dec 10 09:01:46 2013 +0100

    loperf: Generate also history.fods.

diff --git a/loperf/loperf.sh b/loperf/loperf.sh
index e12e069..924c8df 100755
--- a/loperf/loperf.sh
+++ b/loperf/loperf.sh
@@ -60,7 +60,7 @@ CSV_HISTORY="logs/history.csv"
 mkdir -p logs/callgrind > /dev/null 2>&1
 mkdir -p logs/loperf > /dev/null 2>&1
 mkdir -p "$CSV_LOG_DIR" > /dev/null 2>&1
-test -f "$CSV_HISTORY" || echo -e "date\ttime\tgit-commit\toffload$(ls docs/* | sed s%docs/%\\t%g | tr -d '\n')" > "$CSV_HISTORY"
+test -f "$CSV_HISTORY" || echo -e "time,git-commit,offload$(ls docs/* | sed s%docs/%,%g | tr -d '\n')" > "$CSV_HISTORY"
 
 function launch {
 
@@ -108,7 +108,7 @@ done
 # CEst = Ir + 10 Bm + 10 L1m + 20 Ge + 100 L2m + 100 LLm
 CEst=$(expr ${offload[0]} + 10 \* $(expr ${offload[12]} + ${offload[10]}) + 10 \* $(expr ${offload[3]} + ${offload[4]} + ${offload[5]}) + 20 \* ${offload[13]} + 100 \* $(expr ${offload[6]} + ${offload[7]} + ${offload[8]}))
 echo $'\t'$CEst >> "$CSV_FN"
-echo -n "$TESTDATE"$'\t'"$LOVERSION"$'\t'$CEst >> "$CSV_HISTORY"
+echo -n "$TESTDATE","$LOVERSION",$CEst >> "$CSV_HISTORY"
 
 # Populate offload to PF_LOG
 echo " Ir Dr Dw I1mr D1mr D1mw ILmr DLmr DLmw Bc Bcm Bi Bim Ge" | tee -a "$PF_LOG"
@@ -166,13 +166,14 @@ find docs -type f |  grep -Ev "\/\." | while read f; do
     # CEst = Ir + 10 Bm + 10 L1m + 20 Ge + 100 L2m + 100 LLm
     CEst=$(expr ${onload[0]} + 10 \* $(expr ${onload[12]} + ${onload[10]}) + 10 \* $(expr ${onload[3]} + ${onload[4]} + ${onload[5]}) + 20 \* ${onload[13]} + 100 \* $(expr ${onload[6]} + ${onload[7]} + ${onload[8]}))
     echo $'\t'$CEst >> "$CSV_FN"
-    echo -n $'\t'$CEst >> "$CSV_HISTORY"
+    echo -n ",$CEst" >> "$CSV_HISTORY"
 
     echo | tee -a "$PF_LOG"
     echo | tee -a "$PF_LOG"
 
 done
 echo "" >> "$CSV_HISTORY"
+$OFFICEBIN --headless --convert-to fods --outdir logs "$CSV_HISTORY"
 
 # Clean old callgrind files
 find "logs/callgrind" -type f -mtime +10 -exec rm {} \;
commit c5afe490ac1adb962ed8649e602db946ad8bf78e
Author: Matúš Kukan <matus.kukan at collabora.com>
Date:   Tue Dec 3 21:49:41 2013 +0100

    loperf: Comment out regression check again.
    
    It was uncommented by accident and probably does not work.

diff --git a/loperf/loperf.sh b/loperf/loperf.sh
index 0a5d557..e12e069 100755
--- a/loperf/loperf.sh
+++ b/loperf/loperf.sh
@@ -178,9 +178,9 @@ echo "" >> "$CSV_HISTORY"
 find "logs/callgrind" -type f -mtime +10 -exec rm {} \;
 
 # Regression check
-echo "Regression Status:" | tee -a "$PF_LOG"
-echo "-----------------" | tee -a "$PF_LOG"
-find $(dirname $(readlink -f "$PF_LOG")) -type f | grep -v "$PF_LOG" | grep log$ | while read rf; do
-    check_regression "$PF_LOG" "$rf" | tee -a "$PF_LOG"
-done
-grep '^Regression found!$' "$PF_LOG" > /dev/null || echo "Congratulations, no regression found!" | tee -a "$PF_LOG"
+# echo "Regression Status:" | tee -a "$PF_LOG"
+# echo "-----------------" | tee -a "$PF_LOG"
+# find $(dirname $(readlink -f "$PF_LOG")) -type f | grep -v "$PF_LOG" | grep log$ | while read rf; do
+#     check_regression "$PF_LOG" "$rf" | tee -a "$PF_LOG"
+# done
+# grep '^Regression found!$' "$PF_LOG" > /dev/null || echo "Congratulations, no regression found!" | tee -a "$PF_LOG"
commit 2e41da8674b2a0d1ec147843de8d1b27ff7bbd44
Author: Matúš Kukan <matus.kukan at collabora.com>
Date:   Tue Dec 3 21:49:07 2013 +0100

    loperf: Write history at new lines.

diff --git a/loperf/loperf.sh b/loperf/loperf.sh
index 9d36a7f..0a5d557 100755
--- a/loperf/loperf.sh
+++ b/loperf/loperf.sh
@@ -172,6 +172,7 @@ find docs -type f |  grep -Ev "\/\." | while read f; do
     echo | tee -a "$PF_LOG"
 
 done
+echo "" >> "$CSV_HISTORY"
 
 # Clean old callgrind files
 find "logs/callgrind" -type f -mtime +10 -exec rm {} \;