diff options
| author | Luboš Luňák <l.lunak@collabora.com> | 2020-09-05 16:31:37 +0200 |
|---|---|---|
| committer | Luboš Luňák <l.lunak@collabora.com> | 2020-09-08 09:56:36 +0200 |
| commit | e8eaf5e287efb304590b1821a2a738ddcdebe9fe (patch) | |
| tree | e37d92c00bd1427e4bcf5e0d816f6ec4db8ebb5b /compilerplugins | |
| parent | c2275ee554cae1cf4909a4fc12be4be127be011e (diff) | |
longer watchdog timeouts for debug Skia build
Skia runs internal checks, which occassionally actually may take
a bit. Also abort() in dbgutil build already in case the watchdog
disables Skia, to make finding these easier.
Change-Id: I9ed09c57414e056de20a561b6945cba930edd37b
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/102096
Tested-by: Jenkins
Reviewed-by: Luboš Luňák <l.lunak@collabora.com>
Diffstat (limited to 'compilerplugins')
| -rw-r--r-- | compilerplugins/clang/checkconfigmacros.cxx | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/compilerplugins/clang/checkconfigmacros.cxx b/compilerplugins/clang/checkconfigmacros.cxx index 23f6947a3646..6daa9ed2a17e 100644 --- a/compilerplugins/clang/checkconfigmacros.cxx +++ b/compilerplugins/clang/checkconfigmacros.cxx @@ -67,7 +67,11 @@ void CheckConfigMacros::MacroDefined( const Token& macroToken, const MacroDirect || hasPathnamePrefix(filename, BUILDDIR "/config_build/") )) { // fprintf(stderr,"DEF: %s %s\n", macroToken.getIdentifierInfo()->getName().data(), filename ); - configMacros.insert( macroToken.getIdentifierInfo()->getName().str()); + StringRef macro = macroToken.getIdentifierInfo()->getName(); + // Skia #defines do not have values, but we set them in config_skia.h . + if( macro.startswith( "SK_" ) && loplugin::isSamePathname(filename, BUILDDIR "/config_host/config_skia.h")) + return; + configMacros.insert( macro.str()); } } |