diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2020-05-26 16:10:20 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2020-05-26 18:57:47 +0200 |
| commit | 8ceb988dcc1457994f3711a9e57d0c4214254a53 (patch) | |
| tree | dbacb71817fb840604827c1deb89a47d31e7f84b /o3tl | |
| parent | b149c61ba93d7a6e84f44d3a7f04e00643e615a1 (diff) | |
Don't run CompilerTest_o3tl_* with COMPILER_PLUGIN_TOOL=...
...similar to 2228203a8211dea1c8addb98298096a094ec788b "Don't run
CompilerTest_compilerplugins_clang with COMPILER_PLUGIN_TOOL=...", as otherwise
e.g., `make check COMPILER_PLUGIN_TOOL=fakebool` failed with
> o3tl/qa/compile-temporary.cxx:22:8: error: call to deleted function 'temporary'
> f(&o3tl::temporary(n)); // expected-error {{}} expected-note@o3tl/temporary.hxx:* 0+ {{}}
> ^~~~~~~~~~~~~~~
> include/o3tl/temporary.hxx:22:36: note: candidate function [with T = int] has been explicitly deleted
> template <typename T> constexpr T& temporary(T&) = delete;
> ^
> include/o3tl/temporary.hxx:21:36: note: candidate function [with T = int &]
> template <typename T> constexpr T& temporary(T&& x) { return x; }
> ^
Change-Id: I4dfa433708c064413f365375c84b85ced63c8d4e
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/94871
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
Diffstat (limited to 'o3tl')
| -rw-r--r-- | o3tl/Module_o3tl.mk | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/o3tl/Module_o3tl.mk b/o3tl/Module_o3tl.mk index fa1516bca436..66f7d7a1cda2 100644 --- a/o3tl/Module_o3tl.mk +++ b/o3tl/Module_o3tl.mk @@ -23,8 +23,9 @@ $(eval $(call gb_Module_add_targets,o3tl,\ $(eval $(call gb_Module_add_check_targets,o3tl,\ CppunitTest_o3tl_tests \ - $(if $(COM_IS_CLANG),CompilerTest_o3tl_temporary) \ - $(if $(COM_IS_CLANG),CompilerTest_o3tl_unsafe_downcast) \ + $(if $(COM_IS_CLANG),$(if $(COMPILER_EXTERNAL_TOOL)$(COMPILER_PLUGIN_TOOL),, \ + CompilerTest_o3tl_temporary \ + CompilerTest_o3tl_unsafe_downcast)) \ )) # vim: set noet sw=4: |