test-bugzilla-files/commands.sh      |    7 ++-----
 test-bugzilla-files/commands_asan.sh |   14 +++++++++++++-
 test-bugzilla-files/execute.sh       |   12 ++++--------
 test-bugzilla-files/zip.sh           |   13 +++++--------
 4 files changed, 24 insertions(+), 22 deletions(-)

New commits:
commit 6f9fbb60a9a6866183e2b00b1d3a5309f0062866
Author:     Miklos Vajna <vmik...@collabora.com>
AuthorDate: Wed Jul 28 14:34:49 2021 +0200
Commit:     Miklos Vajna <vmik...@collabora.com>
CommitDate: Wed Jul 28 15:06:45 2021 +0200

    test-bugzilla-files: update to what is running on the crashtesting machine
    
    Allows further development for
    
<https://blog.documentfoundation.org/blog/2021/06/02/tender-to-implement-automated-odf-filter-regression-testing-202106-01/>.
    
    Change-Id: I686a6081dc8779a89f17989ecc3a09c741b9cc84
    Reviewed-on: https://gerrit.libreoffice.org/c/dev-tools/+/119607
    Tested-by: Miklos Vajna <vmik...@collabora.com>
    Reviewed-by: Miklos Vajna <vmik...@collabora.com>

diff --git a/test-bugzilla-files/commands.sh b/test-bugzilla-files/commands.sh
index 56a923c..32052ed 100755
--- a/test-bugzilla-files/commands.sh
+++ b/test-bugzilla-files/commands.sh
@@ -1,6 +1,5 @@
 #!/bin/bash
 cd /srv/crashtestdata/
-source config.cfg
 rm tmpdir/* -r
 rm current/* -r
 rm control/* -r
@@ -18,8 +17,7 @@ cd ~/build/
 make build-nocheck
 
 if [ "$?" != "0" ]; then
-       /srv/crashtestdata/sendEmail -f crashtest.libreoff...@gmail.com -t 
markus.mohrh...@googlemail.com -o tls=yes -s smtp.gmail.com:587 -u "Crash test 
build failure" -m "The build failed. Please check!" -xu crashtest.libreoffice 
-xp $PASSWORD
-       /srv/crashtestdata/sendEmail -f crashtest.libreoff...@gmail.com -t 
caol...@redhat.com -o tls=yes -s smtp.gmail.com:587 -u "Crash test build 
failure" -m "The build failed. Please check!" -xu crashtest.libreoffice -xp 
$PASSWORD
+    /srv/crashtestdata/sendEmail -t markus.mohrh...@googlemail.com -t 
caol...@redhat.com -u "Crash test build failure" -m "The build failed. Please 
check!"
     exit 1
 fi
 
@@ -28,8 +26,7 @@ cd ~/source/dev-tools/test-bugzilla-files/
 python3 new-control.py /srv/crashtestdata/files/
 
 if [ "$?" != "0" ]; then
-       /srv/crashtestdata/sendEmail -f crashtest.libreoff...@gmail.com -t 
markus.mohrh...@googlemail.com -o tls=yes -s smtp.gmail.com:587 -u "Crash test 
failure" -m "The test run failed. Please check!" -xu crashtest.libreoffice -xp 
$PASSWORD
-       /srv/crashtestdata/sendEmail -f crashtest.libreoff...@gmail.com -t 
caol...@redhat.com -o tls=yes -s smtp.gmail.com:587 -u "Crash test failure" -m 
"The test run failed. Please check!" -xu crashtest.libreoffice -xp $PASSWORD
+    /srv/crashtestdata/sendEmail -t markus.mohrh...@googlemail.com -t 
caol...@redhat.com -u "Crash test failure" -m "The test run failed. Please 
check!"
     exit 1
 fi
 
diff --git a/test-bugzilla-files/commands_asan.sh 
b/test-bugzilla-files/commands_asan.sh
index bc3dc8a..b01c0f6 100755
--- a/test-bugzilla-files/commands_asan.sh
+++ b/test-bugzilla-files/commands_asan.sh
@@ -1,16 +1,28 @@
 #!/bin/bash
 cd /srv/crashtestdata/
-source config.cfg
+source /srv/ubsan/sberg/lo/core/SETENV
 rm tmpdir/* -r
 rm current/* -r
 rm control/* -r
 rm console_*
+#cd /srv/crashtestdata/asan-build
 cd ~/source/libo-core/
 SHA=`git rev-parse HEAD`
 echo $SHA
 mkdir -p /srv/crashtestdata/logs_asan/$SHA
 
+#if [ "$?" != "0" ]; then
+#    /srv/crashtestdata/sendEmail -t markus.mohrh...@googlemail.com -t 
vmik...@collabora.co.uk -u "Crash test build failure" -m "The Asan build 
failed. Please check!"
+#    exit 1
+#fi
+
 cd ~/source/dev-tools/test-bugzilla-files/
 python3 new-control.py --asan /srv/crashtestdata/files/ 
 
+#if [ "$?" != "0" ]; then
+#    /srv/crashtestdata/sendEmail -t markus.mohrh...@googlemail.com -t 
vmik...@collabora.co.uk -u "Crash test failure" -m "The Asan test run failed. 
Please check!"
+#    exit 1
+#fi
+
 cd /srv/crashtestdata/
+./zip-asan.sh
diff --git a/test-bugzilla-files/execute.sh b/test-bugzilla-files/execute.sh
index 3c91e34..ee6f980 100755
--- a/test-bugzilla-files/execute.sh
+++ b/test-bugzilla-files/execute.sh
@@ -1,8 +1,4 @@
-#!/bin/bash
-ulimit -c unlimited
-dir_name=$(basename $1)
-dir=${PWD}
-source ${dir}/config
-mkdir -p ${CRASHTESTDATA}/control/$dir_name
-cd ${CRASHTESTDATA}/control/$dir_name
-TMPDIR=${CRASHTESTDATA}/tmpdir ${INSTDIR}/program/python 
${dir}/test-bugzilla-files.py --soffice=path:${INSTDIR}/program/soffice 
--userdir=file://${USERDIR}/libreoffice_$dir_name/4 $1 2>&1 | tee 
${CRASHTESTDATA}/console_$dir_name.log
+mkdir /srv/crashtestdata/control/$1
+cd /srv/crashtestdata/control/$1
+TMPDIR=/srv/crashtestdata/tmpdir /home/buildslave/build/instdir/program/python 
/home/buildslave/source/dev-tools/test-bugzilla-files/test-bugzilla-files.py 
--soffice=path:/home/buildslave/build/instdir/program/soffice 
--userdir=file:///srv/crashtestdata/.config/libreoffice_$1/4 
/srv/crashtestdata/files/$1 2>&1 | tee /srv/crashtestdata/console_$i.log
+rm core*
diff --git a/test-bugzilla-files/zip.sh b/test-bugzilla-files/zip.sh
index ca96035..aaa4426 100755
--- a/test-bugzilla-files/zip.sh
+++ b/test-bugzilla-files/zip.sh
@@ -1,12 +1,12 @@
 #!/bin/bash
+
 cd ~/source/libo-core/
 SHA=`git rev-parse HEAD`
 echo $SHA
 cd /srv/crashtestdata/
-source config.cfg
 cd /srv/crashtestdata/control/
 mkdir -p /srv/crashtestdata/logs/$SHA/backtraces
-for a in */core*; do gdb ~/build/instdir/program/soffice.bin $a -ex "thread 
apply all backtrace full" --batch > 
/srv/crashtestdata/logs/$SHA/backtraces/`dirname "$a"`-`basename 
"$a"`.backtrace; done
+for a in */core*; do gdb ~/build/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
 cd /srv/crashtestdata/current/srv/crashtestdata/files/
@@ -17,14 +17,11 @@ unzip validation.zip -d validation
 rm *.zip
 cp ~/source/dev-tools/test-bugzilla-files/analyze-logs.py .
 cp ../*.csv .
-python3 analyze-logs.py
+python analyze-logs.py
 cp *.csv ../.
 cd ..
 zip -r current.zip $SHA/*
 scp current.zip 
upl...@gimli.documentfoundation.org:/srv/www/dev-builds.libreoffice.org/crashtest/.
-ssh upl...@gimli.documentfoundation.org 'bash -s' << 'ENDSSH'
-cd /srv/www/dev-builds.libreoffice.org/crashtest/
-unzip current.zip
-ENDSSH
+ssh upl...@gimli.documentfoundation.org unzip -n 
/srv/www/dev-builds.libreoffice.org/crashtest/current.zip -d 
/srv/www/dev-builds.libreoffice.org/crashtest
 cd /srv/crashtestdata/
-./sendEmail -f "Crashtest VM <crashtest.libreoff...@gmail.com>" -t 
libreoffice@lists.freedesktop.org -o tls=yes -s smtp.gmail.com:587 -u "Crash 
test update" -m "New crashtest update available at 
https://dev-builds.libreoffice.org/crashtest/$SHA/"; -a logs/*.csv -xu 
crashtest.libreoffice -xp $PASSWORD
+/srv/crashtestdata/sendEmail -t libreoffice@lists.freedesktop.org -u "Crash 
test update" -m "New crashtest update available at 
https://dev-builds.libreoffice.org/crashtest/$SHA/"; -a logs/*.csv
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Reply via email to