From d8bd81fff87acd0de39626da52bb7365f527157b Mon Sep 17 00:00:00 2001 From: Michael Stahl Date: Tue, 22 Aug 2017 21:35:44 +0200 Subject: unotest: really run every CppunitTest with its own user profile Apparently a sw unit test randomly read a partially written autotbl.fmt that was written by another unit test, in particular the file workdir/unittest/user/config/autotbl.fmt. The tests are actually started with -env:UserInstallation=$(call gb_Helper_make_url,$(call gb_CppunitTest_get_target,$*).user) to prevent exactly this problem, but unfortunately it's then overridden by a call to rtl::Bootstrap::set(), which overrides even command line arguments, from test::BootstrapFixtureBase::setUp(). Change-Id: I618574e94755ea38caf9583f3dcf7715396bca48 Reviewed-on: https://gerrit.libreoffice.org/41432 Tested-by: Jenkins Reviewed-by: Michael Stahl --- solenv/gbuild/CppunitTest.mk | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'solenv') diff --git a/solenv/gbuild/CppunitTest.mk b/solenv/gbuild/CppunitTest.mk index cc6a70d1b5e1..0bd2e95b4efb 100644 --- a/solenv/gbuild/CppunitTest.mk +++ b/solenv/gbuild/CppunitTest.mk @@ -72,6 +72,7 @@ gb_CppunitTest_RUNTIMEDEPS += \ $(call gb_Library_get_target,localedata_es) \ $(call gb_Library_get_target,localedata_euro) \ $(call gb_Library_get_target,localedata_others) \ + $(call gb_Package_get_target,test_unittest) \ define gb_CppunitTest__make_args $(HEADLESS) \ @@ -115,7 +116,7 @@ else $(if $(gb_CppunitTest_vcl_hide_windows),export VCL_HIDE_WINDOWS=1 && ) \ $(if $(gb_CppunitTest_vcl_show_windows),unset VCL_HIDE_WINDOWS && ) \ mkdir -p $(dir $@) && \ - rm -fr $@.user && mkdir $@.user && \ + rm -fr $@.user && cp -r $(WORKDIR)/unittest $@.user && \ $(if $(gb_CppunitTest__use_confpreinit), \ $(INSTDIR)/program/lokconf_init $(call gb_CppunitTest__make_args) &&) \ $(if $(gb_CppunitTest__interactive),, \ -- cgit