test-bugzilla-files/zip.sh | 42 +++++++++++++++++++++--------------------- 1 file changed, 21 insertions(+), 21 deletions(-)
New commits: commit 484c6bfafc5a728ed8cb5f76a865f6df0e710133 Author: Gabor Kelemen <[email protected]> AuthorDate: Mon Oct 10 22:23:39 2022 +0200 Commit: Caolán McNamara <[email protected]> CommitDate: Tue Oct 11 10:05:41 2022 +0200 Use more CRASHTESTDATA in zip.sh This was an automatic seek&destroy operation, may have side effects Change-Id: I4087da3c8860b5bfb1a2b7b18344d719662ff811 Reviewed-on: https://gerrit.libreoffice.org/c/dev-tools/+/141173 Reviewed-by: Caolán McNamara <[email protected]> Tested-by: Caolán McNamara <[email protected]> diff --git a/test-bugzilla-files/zip.sh b/test-bugzilla-files/zip.sh index db874b8..84b0910 100755 --- a/test-bugzilla-files/zip.sh +++ b/test-bugzilla-files/zip.sh @@ -3,31 +3,31 @@ cd "$SRCDIR" SHA=`git rev-parse HEAD` echo $SHA -cd /srv/crashtestdata/ -cd /srv/crashtestdata/control/ -mkdir -p /srv/crashtestdata/logs/$SHA/backtraces -for a in */core*; do gdb "$INSTDIR"/program/soffice.bin $a -ex "thread apply all backtrace full" --batch > /srv/crashtestdata/logs/$SHA/backtraces/`dirname "$a"`-`basename "$a"`.backtrace.txt; done -cat */crashlog.txt > /srv/crashtestdata/logs/$SHA/crashlog.txt -cat */exportCrash.txt > /srv/crashtestdata/logs/$SHA/exportCrash.txt -echo "filename,total-diff-count,attr-diff-count,node-diff-count" > /srv/crashtestdata/logs/$SHA/odfundifflog.csv -cat */odfundifflog.csv >> /srv/crashtestdata/logs/$SHA/odfundifflog.csv +cd "$CRASHTESTDATA"/ +cd "$CRASHTESTDATA"/control/ +mkdir -p "$CRASHTESTDATA"/logs/$SHA/backtraces +for a in */core*; do gdb "$INSTDIR"/program/soffice.bin $a -ex "thread apply all backtrace full" --batch > "$CRASHTESTDATA"/logs/$SHA/backtraces/`dirname "$a"`-`basename "$a"`.backtrace.txt; done +cat */crashlog.txt > "$CRASHTESTDATA"/logs/$SHA/crashlog.txt +cat */exportCrash.txt > "$CRASHTESTDATA"/logs/$SHA/exportCrash.txt +echo "filename,total-diff-count,attr-diff-count,node-diff-count" > "$CRASHTESTDATA"/logs/$SHA/odfundifflog.csv +cat */odfundifflog.csv >> "$CRASHTESTDATA"/logs/$SHA/odfundifflog.csv # Ignore the header. -num_of_odf_diffs=$(($(< "/srv/crashtestdata/logs/$SHA/odfundifflog.csv" wc -l)-1)) -num_of_import_crashes=$(< "/srv/crashtestdata/logs/$SHA/crashlog.txt" wc -l) -num_of_export_crashes=$(< "/srv/crashtestdata/logs/$SHA/exportCrash.txt" wc -l) -num_of_excluded_file=$(< "/srv/crashtestdata/odfundiff_exclude_list.txt" wc -l) -previous_hash="$(cat /srv/crashtestdata/previous/hash.txt)" -rm -rf /srv/crashtestdata/logs/$SHA/odfundiff -cd /srv/crashtestdata/current/srv/crashtestdata/files/ +num_of_odf_diffs=$(($(< ""$CRASHTESTDATA"/logs/$SHA/odfundifflog.csv" wc -l)-1)) +num_of_import_crashes=$(< ""$CRASHTESTDATA"/logs/$SHA/crashlog.txt" wc -l) +num_of_export_crashes=$(< ""$CRASHTESTDATA"/logs/$SHA/exportCrash.txt" wc -l) +num_of_excluded_file=$(< ""$CRASHTESTDATA"/odfundiff_exclude_list.txt" wc -l) +previous_hash="$(cat "$CRASHTESTDATA"/previous/hash.txt)" +rm -rf "$CRASHTESTDATA"/logs/$SHA/odfundiff +cd "$CRASHTESTDATA"/current"$CRASHTESTDATA"/files/ rm -f odfundiff.zip zip -r -q odfundiff.zip */*.odfundiff -mv odfundiff.zip /srv/crashtestdata/logs/$SHA/. +mv odfundiff.zip "$CRASHTESTDATA"/logs/$SHA/. if [ -e validation.zip ]; then rm -f validation.zip zip -r -q validation.zip */*.log - mv validation.zip /srv/crashtestdata/logs/$SHA/. + mv validation.zip "$CRASHTESTDATA"/logs/$SHA/. fi -cd /srv/crashtestdata/logs/$SHA +cd "$CRASHTESTDATA"/logs/$SHA if [ -e validation.zip ]; then unzip validation.zip -d validation fi @@ -45,8 +45,8 @@ if [ -z "$CRASHTEST_NO_UPLOAD" ]; then scp current.zip [email protected]:/srv/www/dev-builds.libreoffice.org/crashtest/. ssh [email protected] unzip -n /srv/www/dev-builds.libreoffice.org/crashtest/current.zip -d /srv/www/dev-builds.libreoffice.org/crashtest fi -cd /srv/crashtestdata/ -diskusagefile=/srv/crashtestdata/diskusageinfo.txt +cd "$CRASHTESTDATA"/ +diskusagefile="$CRASHTESTDATA"/diskusageinfo.txt if [ -e $diskusagefile ]; then free_disk_space="$(cat $diskusagefile)" rm $diskusagefile @@ -87,5 +87,5 @@ cat << EOF >> mail.txt EOF if [ -z "$CRASHTEST_NO_EMAIL" ]; then - /srv/crashtestdata/sendEmail -t [email protected] -u "Crash test update" -m "$(cat /srv/crashtestdata/mail.txt)" -a logs/*.csv + "$CRASHTESTDATA"/sendEmail -t [email protected] -u "Crash test update" -m "$(cat "$CRASHTESTDATA"/mail.txt)" -a logs/*.csv fi
