diff options
| author | Luboš Luňák <l.lunak@collabora.com> | 2021-04-08 13:14:53 +0200 |
|---|---|---|
| committer | Luboš Luňák <l.lunak@collabora.com> | 2021-04-08 17:21:55 +0200 |
| commit | 9cd313228477f0b471f759e3e71810ddae8654e4 (patch) | |
| tree | 8ad898ded4e92c8b4e2ce2dd4564683979ce505e /bin | |
| parent | 9e88172d28edf315676f52ed9a99077e95cd9628 (diff) | |
make update_pch.sh abort on an error
The script depends also on generated sources in workdir, which
it may fail to find if they haven't been built before running
the script. Prefer to fail on errors rather than ignoring them.
Note that when using builddir != srcdir, the script requires
$WORKDIR to be set (done e.g. by the recommended
'make cmd cmd="./bin/update_pch.sh [..]"').
Change-Id: I93429c133bd0876730a850d944707880848201f0
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/113798
Tested-by: Jenkins
Reviewed-by: Luboš Luňák <l.lunak@collabora.com>
Diffstat (limited to 'bin')
| -rwxr-xr-x | bin/update_pch | 3 | ||||
| -rwxr-xr-x | bin/update_pch.sh | 5 |
2 files changed, 7 insertions, 1 deletions
diff --git a/bin/update_pch b/bin/update_pch index 6641f1584055..9b541d8a87a9 100755 --- a/bin/update_pch +++ b/bin/update_pch @@ -1107,7 +1107,8 @@ def main(): return 0 # Didn't update. - return 1 + # Use exit code 2 to distinguish it from exit code 1 used e.g. when an exception occurs. + return 2 if __name__ == '__main__': """ Process all the includes in a Module diff --git a/bin/update_pch.sh b/bin/update_pch.sh index 78b4a47e6044..4c17a0374757 100755 --- a/bin/update_pch.sh +++ b/bin/update_pch.sh @@ -58,6 +58,11 @@ for x in $headers; do libname=`echo $header | sed -e s/.*precompiled_// -e s/\.hxx//` ./bin/update_pch "$module" "$libname" + exitcode=$? + if test $exitcode -ne 0 -a $exitcode -ne 2; then + echo Failed. + exit 1 + fi fi done |