sc/UITest_solver.mk | 3 +++
1 file changed, 3 insertions(+)
New commits:
commit fd97e65a3c22d5124835d736e74625fb114a34b6
Author: Stephan Bergmann <sberg...@redhat.com>
Date: Wed Jun 20 16:28:47 2018 +0200
Fix UITest_solver for --enable-ext-nlpsolver
...after <https://gerrit.libreoffice.org/#/c/56121/> "uitest Calc/Solver"
was
merged (see comments there for details)
Change-Id: I6cc0833b353d79a3be3be85078776c44588b5182
Reviewed-on: https://gerrit.libreoffice.org/56163
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sberg...@redhat.com>
diff --git a/sc/UITest_solver.mk b/sc/UITest_solver.mk
index 2e8e6af0076e..bb1ca884e166 100644
--- a/sc/UITest_solver.mk
+++ b/sc/UITest_solver.mk
@@ -13,8 +13,11 @@ $(eval $(call
gb_UITest_add_modules,solver,$(SRCDIR)/sc/qa/uitest,\
solver/ \
))
+# Disable bundled extensions with a hack, so that the alternative solver from
--enable-ext-nlpsolver
+# does not kick in and cause the test's expectations to not be met:
$(eval $(call gb_UITest_set_defs,solver, \
TDOC="$(SRCDIR)/sc/qa/uitest/calc_tests/data" \
+ BUNDLED_EXTENSIONS='$$$$BRAND_BASE_DIR/NONE' \
))
# vim: set noet sw=4 ts=4:
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
