[Libreoffice-commits] core.git: solenv/gbuild

[Miklos Vajna (via logerrit)]

 solenv/gbuild/CppunitTest.mk |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 02ac9b042d544dc8cf261017e0f31721f30642cd
Author:     Miklos Vajna <vmiklos at collabora.com>
AuthorDate: Fri Aug 14 13:53:43 2020 +0200
Commit:     Miklos Vajna <vmiklos at collabora.com>
CommitDate: Fri Aug 14 16:18:22 2020 +0200

    solenv: fix typo in CppunitTest
    
    Added in commit 2edc86a592bc943fcffef0a8ae8db220e18e2b37 (Default all
    tests to run with the svp plugin, 2018-11-23), if svp is to be avoided,
    it has to be filtered out from the environment variables, not filtered
    for.
    
    With this, the unexpected SAL_USE_VCLPLUGIN=gen is gone from the
    generated cmdline when using gb_CppunitTest_use_vcl_non_headless.
    
    Change-Id: Ib666f3df007898165f2019f0a9b0677f679aa6e1
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/100742
    Tested-by: Jenkins
    Reviewed-by: Jan-Marek Glogowski <glogow at fbihome.de>

diff --git a/solenv/gbuild/CppunitTest.mk b/solenv/gbuild/CppunitTest.mk
index efe39ed45a8d..4a33ac581366 100644
--- a/solenv/gbuild/CppunitTest.mk
+++ b/solenv/gbuild/CppunitTest.mk
@@ -122,7 +122,7 @@ else
 		$(if $(gb_CppunitTest_localized),for l in $(WITH_LANG_LIST) ; do LO_TEST_LOCALE="$$l" ) \
 		$(if $(gb_CppunitTest_PREGDBTRACE),$(gb_CppunitTest_PREGDBTRACE) &&) \
 		$(if $(gb_CppunitTest__vcl_no_svp), \
-			$(filter SAL_USE_VCLPLUGIN=svp,$(gb_TEST_ENV_VARS)),$(gb_TEST_ENV_VARS)) \
+			$(filter-out SAL_USE_VCLPLUGIN=svp,$(gb_TEST_ENV_VARS)),$(gb_TEST_ENV_VARS)) \
 		$(EXTRA_ENV_VARS) \
 		$(if $(filter gdb,$(gb_CppunitTest_GDBTRACE)),,$(gb_CppunitTest_CPPTESTPRECOMMAND)) \
 		$(if $(G_SLICE),G_SLICE=$(G_SLICE)) \