Kaydet (Commit) 2651df5a authored tarafından Rene Engelhard's avatar Rene Engelhard

sccomp_lpsolver -> sccomp_solver

This test also tests the CoinMP solver, no _lpsolver is misleading

Change-Id: If56de3aa84ec80b1888aadeb940e08e65083c9e9
Reviewed-on: https://gerrit.libreoffice.org/41607Reviewed-by: 's avatarRene Engelhard <rene@debian.org>
Tested-by: 's avatarRene Engelhard <rene@debian.org>
üst 20b7b150
...@@ -7,41 +7,41 @@ ...@@ -7,41 +7,41 @@
# file, You can obtain one at http://mozilla.org/MPL/2.0/. # file, You can obtain one at http://mozilla.org/MPL/2.0/.
# #
$(eval $(call gb_CppunitTest_CppunitTest,sccomp_lpsolver)) $(eval $(call gb_CppunitTest_CppunitTest,sccomp_solver))
$(eval $(call gb_CppunitTest_add_exception_objects,sccomp_lpsolver,\ $(eval $(call gb_CppunitTest_add_exception_objects,sccomp_solver,\
sccomp/qa/unit/lpsolver \ sccomp/qa/unit/solver \
)) ))
$(eval $(call gb_CppunitTest_use_externals,sccomp_lpsolver,\ $(eval $(call gb_CppunitTest_use_externals,sccomp_solver,\
boost_headers \ boost_headers \
)) ))
$(eval $(call gb_CppunitTest_add_defs,sccomp_lpsolver,\ $(eval $(call gb_CppunitTest_add_defs,sccomp_solver,\
$(if $(ENABLE_COINMP), -DENABLE_COINMP) \ $(if $(ENABLE_COINMP), -DENABLE_COINMP) \
$(if $(ENABLE_LPSOLVE), -DENABLE_LPSOLVE) \ $(if $(ENABLE_LPSOLVE), -DENABLE_LPSOLVE) \
)) ))
$(eval $(call gb_CppunitTest_use_libraries,sccomp_lpsolver,\ $(eval $(call gb_CppunitTest_use_libraries,sccomp_solver,\
cppu \ cppu \
sal \ sal \
test \ test \
unotest \ unotest \
)) ))
$(eval $(call gb_CppunitTest_set_include,sccomp_lpsolver,\ $(eval $(call gb_CppunitTest_set_include,sccomp_solver,\
-I$(SRCDIR)/sc/inc \ -I$(SRCDIR)/sc/inc \
$$(INCLUDE) \ $$(INCLUDE) \
)) ))
$(eval $(call gb_CppunitTest_use_sdk_api,sccomp_lpsolver)) $(eval $(call gb_CppunitTest_use_sdk_api,sccomp_solver))
$(eval $(call gb_CppunitTest_use_ure,sccomp_lpsolver)) $(eval $(call gb_CppunitTest_use_ure,sccomp_solver))
$(eval $(call gb_CppunitTest_use_vcl,sccomp_lpsolver)) $(eval $(call gb_CppunitTest_use_vcl,sccomp_solver))
$(eval $(call gb_CppunitTest_use_rdb,sccomp_lpsolver,services)) $(eval $(call gb_CppunitTest_use_rdb,sccomp_solver,services))
$(eval $(call gb_CppunitTest_use_configuration,sccomp_lpsolver)) $(eval $(call gb_CppunitTest_use_configuration,sccomp_solver))
# vim: set noet sw=4 ts=4: # vim: set noet sw=4 ts=4:
...@@ -28,7 +28,7 @@ $(eval $(call gb_Module_add_l10n_targets,sccomp,\ ...@@ -28,7 +28,7 @@ $(eval $(call gb_Module_add_l10n_targets,sccomp,\
)) ))
$(eval $(call gb_Module_add_check_targets,sccomp,\ $(eval $(call gb_Module_add_check_targets,sccomp,\
CppunitTest_sccomp_lpsolver \ CppunitTest_sccomp_solver \
)) ))
# vim: set noet sw=4 ts=4: # vim: set noet sw=4 ts=4:
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment