test-bugzilla-files/execute.sh |    6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

New commits:
commit e1f689f4564a43605b90f9fe412c78d5d4a47adc
Author:     Gabor Kelemen <[email protected]>
AuthorDate: Fri Oct 28 14:33:00 2022 +0200
Commit:     Caolán McNamara <[email protected]>
CommitDate: Fri Oct 28 15:53:21 2022 +0200

    Try sourcing $HOME/.config/crashtesting.config here too
    
    This caused some breakage later when result files were at the
    default location and searched at the customized one
    
    Change-Id: Ieb05704b80f6719180961aae03385d9dd3d3a112
    Reviewed-on: https://gerrit.libreoffice.org/c/dev-tools/+/141979
    Reviewed-by: Caolán McNamara <[email protected]>
    Tested-by: Caolán McNamara <[email protected]>

diff --git a/test-bugzilla-files/execute.sh b/test-bugzilla-files/execute.sh
index e6dcde4..0b05658 100755
--- a/test-bugzilla-files/execute.sh
+++ b/test-bugzilla-files/execute.sh
@@ -2,7 +2,11 @@
 ulimit -c unlimited
 dir_name=$(basename $1)
 dir=${PWD}
-source ${dir}/config
+if [ -f $HOME/.config/crashtesting.config ] ; then
+    source $HOME/.config/crashtesting.config
+else
+    source ${dir}/config
+fi
 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 >> 
${CRASHTESTDATA}/console_$dir_name.log 2>&1

Reply via email to