test-bugzilla-files/commands.sh | 14 +++++++++++--- test-bugzilla-files/config | 9 +++++++++ 2 files changed, 20 insertions(+), 3 deletions(-)
New commits: commit a8708b5348fe3e241a2c2bb98ced7186e60183d2 Author: Miklos Vajna <vmik...@collabora.com> AuthorDate: Fri Aug 27 16:49:29 2021 +0200 Commit: Miklos Vajna <vmik...@collabora.com> CommitDate: Fri Aug 27 19:39:23 2021 +0200 crashtest: allow working against a read-only core.git source/build dir This is helpful when working on the crashtesting script itself. Change-Id: I2c2139e3a73f3639af87e40d7136f6f5a317e4b9 Reviewed-on: https://gerrit.libreoffice.org/c/dev-tools/+/121177 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 32052ed..c44d501 100755 --- a/test-bugzilla-files/commands.sh +++ b/test-bugzilla-files/commands.sh @@ -1,20 +1,28 @@ #!/bin/bash +dir=$HOME/source/dev-tools/test-bugzilla-files +source ${dir}/config cd /srv/crashtestdata/ rm tmpdir/* -r rm current/* -r rm control/* -r rm console_* cd ~/build/ -make clean +if [ -z "$CRASHTEST_READONLY_CORE" ]; then + make clean +fi cd ~/source/dev-tools/ git pull -r cd ~/source/libo-core/ -git pull -r +if [ -z "$CRASHTEST_READONLY_CORE" ]; then + git pull -r +fi SHA=`git rev-parse HEAD` echo $SHA mkdir /srv/crashtestdata/logs/$SHA cd ~/build/ -make build-nocheck +if [ -z "$CRASHTEST_READONLY_CORE" ]; then + make build-nocheck +fi if [ "$?" != "0" ]; then /srv/crashtestdata/sendEmail -t markus.mohrh...@googlemail.com -t caol...@redhat.com -u "Crash test build failure" -m "The build failed. Please check!" diff --git a/test-bugzilla-files/config b/test-bugzilla-files/config index 2dfe576..13c88f6 100644 --- a/test-bugzilla-files/config +++ b/test-bugzilla-files/config @@ -2,3 +2,12 @@ export CRASHTESTDATA=/srv/crashtestdata export SRCDIR=/home/buildslave/source/libo-core export INSTDIR=/home/buildslave/build/instdir export USERDIR=/home/buildslave/.config + +# For development purposes: +# Don't touch the core.git source/build directory: +# export CRASHTEST_READONLY_CORE=1 + +dir=$HOME/source/dev-tools/test-bugzilla-files +if [ -e ${dir}/config.local ]; then + source ${dir}/config.local +fi