Re: [openoffice] branch trunk updated: Unbreak --disable-unit-tests builds. The cppuhelper module was unconditionally trying to use gtest.

classic Classic list List threaded Threaded
2 messages Options
Reply | Threaded
Open this post in threaded view
|

Re: [openoffice] branch trunk updated: Unbreak --disable-unit-tests builds. The cppuhelper module was unconditionally trying to use gtest.

Matthias Seidel
Would that fit to:

https://bz.apache.org/ooo/show_bug.cgi?id=125003

?

Am 05.10.19 um 00:44 schrieb [hidden email]:

> This is an automated email from the ASF dual-hosted git repository.
>
> truckman pushed a commit to branch trunk
> in repository https://gitbox.apache.org/repos/asf/openoffice.git
>
>
> The following commit(s) were added to refs/heads/trunk by this push:
>      new 994a157  Unbreak --disable-unit-tests builds. The cppuhelper module was unconditionally trying to use gtest.
> 994a157 is described below
>
> commit 994a157d5dd37b490eea27fa6eaaa2376a87943b
> Author: Don Lewis <[hidden email]>
> AuthorDate: Fri Oct 4 15:41:43 2019 -0700
>
>     Unbreak --disable-unit-tests builds.
>     The cppuhelper module was unconditionally trying to use gtest.
> ---
>  main/cppuhelper/Module_cppuhelper.mk | 9 +++++++--
>  1 file changed, 7 insertions(+), 2 deletions(-)
>
> diff --git a/main/cppuhelper/Module_cppuhelper.mk b/main/cppuhelper/Module_cppuhelper.mk
> index b0aebdc..4d35952 100644
> --- a/main/cppuhelper/Module_cppuhelper.mk
> +++ b/main/cppuhelper/Module_cppuhelper.mk
> @@ -24,14 +24,19 @@
>  $(eval $(call gb_Module_Module,cppuhelper))
>  
>  $(eval $(call gb_Module_add_targets,cppuhelper,\
> - GoogleTest_cppuhelper_ifcontainer \
> - GoogleTest_cppuhelper_unourl \
>   Library_cppuhelper \
>   Package_inc \
>   Package_findsofficepath \
>   Package_unorc \
>  ))
>  
> +ifeq ($(ENABLE_UNIT_TESTS),YES)
> +$(eval $(call gb_Module_add_check_targets,cppuhelper,\
> + GoogleTest_cppuhelper_ifcontainer \
> + GoogleTest_cppuhelper_unourl \
> +))
> +endif
> +
>  
>  
>  # vim: set noet sw=4 ts=4:
>


smime.p7s (5K) Download Attachment
Reply | Threaded
Open this post in threaded view
|

Re: [openoffice] branch trunk updated: Unbreak --disable-unit-tests builds. The cppuhelper module was unconditionally trying to use gtest.

Don Lewis-2
Yes.

On  5 Oct, Matthias Seidel wrote:

> Would that fit to:
>
> https://bz.apache.org/ooo/show_bug.cgi?id=125003
>
> ?
>
> Am 05.10.19 um 00:44 schrieb [hidden email]:
>> This is an automated email from the ASF dual-hosted git repository.
>>
>> truckman pushed a commit to branch trunk
>> in repository https://gitbox.apache.org/repos/asf/openoffice.git
>>
>>
>> The following commit(s) were added to refs/heads/trunk by this push:
>>      new 994a157  Unbreak --disable-unit-tests builds. The cppuhelper module was unconditionally trying to use gtest.
>> 994a157 is described below
>>
>> commit 994a157d5dd37b490eea27fa6eaaa2376a87943b
>> Author: Don Lewis <[hidden email]>
>> AuthorDate: Fri Oct 4 15:41:43 2019 -0700
>>
>>     Unbreak --disable-unit-tests builds.
>>     The cppuhelper module was unconditionally trying to use gtest.
>> ---
>>  main/cppuhelper/Module_cppuhelper.mk | 9 +++++++--
>>  1 file changed, 7 insertions(+), 2 deletions(-)
>>
>> diff --git a/main/cppuhelper/Module_cppuhelper.mk b/main/cppuhelper/Module_cppuhelper.mk
>> index b0aebdc..4d35952 100644
>> --- a/main/cppuhelper/Module_cppuhelper.mk
>> +++ b/main/cppuhelper/Module_cppuhelper.mk
>> @@ -24,14 +24,19 @@
>>  $(eval $(call gb_Module_Module,cppuhelper))
>>  
>>  $(eval $(call gb_Module_add_targets,cppuhelper,\
>> - GoogleTest_cppuhelper_ifcontainer \
>> - GoogleTest_cppuhelper_unourl \
>>   Library_cppuhelper \
>>   Package_inc \
>>   Package_findsofficepath \
>>   Package_unorc \
>>  ))
>>  
>> +ifeq ($(ENABLE_UNIT_TESTS),YES)
>> +$(eval $(call gb_Module_add_check_targets,cppuhelper,\
>> + GoogleTest_cppuhelper_ifcontainer \
>> + GoogleTest_cppuhelper_unourl \
>> +))
>> +endif
>> +
>>  
>>  
>>  # vim: set noet sw=4 ts=4:
>>
>


---------------------------------------------------------------------
To unsubscribe, e-mail: [hidden email]
For additional commands, e-mail: [hidden email]