diff options
| author | Peter Foley <pefoley2@verizon.net> | 2011-12-17 18:12:13 +0100 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2011-12-17 18:12:13 +0100 |
| commit | 9d79b12871522cb9daebf4f6c850e07edcdce08a (patch) | |
| tree | 2b43e02c1e05f353f622f66d45f6a7175f742a9e /extensions/CppunitTest_extensions_test_update.mk | |
| parent | 4b4c583b90d61865de30de1a88074f600654b627 (diff) | |
extensions: merge in Peter Foley's work in update
Main improvement is that the unit test is now linked against updchk
library.
Diffstat (limited to 'extensions/CppunitTest_extensions_test_update.mk')
| -rw-r--r-- | extensions/CppunitTest_extensions_test_update.mk | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/extensions/CppunitTest_extensions_test_update.mk b/extensions/CppunitTest_extensions_test_update.mk index 36721e720fc1..f0b9a0567bc0 100644 --- a/extensions/CppunitTest_extensions_test_update.mk +++ b/extensions/CppunitTest_extensions_test_update.mk @@ -28,16 +28,11 @@ $(eval $(call gb_CppunitTest_CppunitTest,extensions_test_update)) $(eval $(call gb_CppunitTest_add_exception_objects,extensions_test_update, \ - extensions/source/update/check/download \ - extensions/source/update/check/updatecheck \ - extensions/source/update/check/updatecheckconfig \ - extensions/source/update/check/updatehdl \ - extensions/source/update/check/updateprotocol \ - \ extensions/qa/update/test_update \ )) $(eval $(call gb_CppunitTest_add_linked_libs,extensions_test_update, \ + updchk \ cppu \ cppuhelper \ sal \ @@ -46,6 +41,13 @@ $(eval $(call gb_CppunitTest_add_linked_libs,extensions_test_update, \ $(gb_STDLIBS) \ )) +ifeq ($(OS),WNT) +$(eval $(call gb_CppunitTest_add_linked_libs,extensions_test_update,\ + shell32 \ + ole32 \ +)) +endif + $(eval $(call gb_CppunitTest_use_external,extensions_test_update,curl)) $(eval $(call gb_CppunitTest_set_include,extensions_test_update,\ @@ -67,13 +69,13 @@ $(eval $(call gb_CppunitTest_add_type_rdbs,extensions_test_update,\ $(eval $(call gb_CppunitTest_add_components,extensions_test_update,\ configmgr/source/configmgr \ + extensions/source/update/feed/updatefeed \ unoxml/source/service/unoxml \ )) $(eval $(call gb_CppunitTest_add_old_components,extensions_test_update,\ ucb1 \ ucpfile1 \ - component/extensions/source/update/feed/updatefeed \ )) $(eval $(call gb_CppunitTest_set_args,extensions_test_update,\ |