diff options
| author | David Ostrovsky <david@ostrovsky.org> | 2012-11-07 23:15:37 +0100 |
|---|---|---|
| committer | Norbert Thiebaud <nthiebaud@gmail.com> | 2012-11-07 23:06:25 +0000 |
| commit | c68cd0125dcf8d9f57ee0e1a540a939859e8eed6 (patch) | |
| tree | 0064a3666d09f36ed07671fc527c8fdd601e0859 /connectivity | |
| parent | db8ab560b45e6433946335fdabc85dfa9c75374b (diff) | |
enable ado driver unit test again
The problem is that ado driver creates a link file in the tree
leaving it dirty: tinderbox doesn't like it. Instead of reading
the mdb file direct from srcdir we copy it first to workdir and
read it from there with the new function: getPathFromWorkdir.
Thank you Norbert!
Change-Id: I504bc26b80686db55a505bac19a95cc9c6022fcc
Reviewed-on: https://gerrit.libreoffice.org/1004
Reviewed-by: Norbert Thiebaud <nthiebaud@gmail.com>
Tested-by: Norbert Thiebaud <nthiebaud@gmail.com>
Diffstat (limited to 'connectivity')
| -rw-r--r-- | connectivity/CppunitTest_connectivity_ado.mk | 4 | ||||
| -rw-r--r-- | connectivity/Module_connectivity.mk | 11 | ||||
| -rwxr-xr-x | connectivity/qa/connectivity/ado/DriverTest.cxx | 4 |
3 files changed, 10 insertions, 9 deletions
diff --git a/connectivity/CppunitTest_connectivity_ado.mk b/connectivity/CppunitTest_connectivity_ado.mk index d35f62b9a0a3..f837f99664df 100644 --- a/connectivity/CppunitTest_connectivity_ado.mk +++ b/connectivity/CppunitTest_connectivity_ado.mk @@ -67,4 +67,8 @@ $(eval $(call gb_CppunitTest_use_components,connectivity_ado,\ $(eval $(call gb_CppunitTest_use_configuration,connectivity_ado)) +$(call gb_CppunitTest_get_target,connectivity_ado) : $(WORKDIR)/CppunitTest/TS001018407.mdb +$(WORKDIR)/CppunitTest/TS001018407.mdb : $(SRCDIR)/connectivity/qa/connectivity/ado/TS001018407.mdb + $(call gb_Deliver_deliver,$<,$@) + # vim: set noet sw=4 ts=4: diff --git a/connectivity/Module_connectivity.mk b/connectivity/Module_connectivity.mk index c01f007bb3df..08cae215e1b3 100644 --- a/connectivity/Module_connectivity.mk +++ b/connectivity/Module_connectivity.mk @@ -145,12 +145,11 @@ $(eval $(call gb_Module_add_check_targets,connectivity,\ endif -# FIXME: Makes tinderbox unhappy as it leaves unclean tree -#ifeq ($(GUI),WNT) -#$(eval $(call gb_Module_add_check_targets,connectivity,\ -# CppunitTest_connectivity_ado \ -#)) -#endif +ifeq ($(GUI),WNT) +$(eval $(call gb_Module_add_check_targets,connectivity,\ + CppunitTest_connectivity_ado \ +)) +endif ifneq ($(filter QADEVOOO,$(BUILD_TYPE)),) $(eval $(call gb_Module_add_subsequentcheck_targets,connectivity,\ diff --git a/connectivity/qa/connectivity/ado/DriverTest.cxx b/connectivity/qa/connectivity/ado/DriverTest.cxx index c2e357e4f73f..ee96eebd2fa5 100755 --- a/connectivity/qa/connectivity/ado/DriverTest.cxx +++ b/connectivity/qa/connectivity/ado/DriverTest.cxx @@ -65,10 +65,8 @@ void AdoDriverTest::setUp() m_xAdoComponent = getMultiServiceFactory()->createInstance("com.sun.star.comp.sdbc.ado.ODriver"); CPPUNIT_ASSERT_MESSAGE("no ado component!", m_xAdoComponent.is()); - // is this the best way to pass test file through URL? - // may be take a custom Sequence< PropertyValue > route? OUString url = OUString("sdbc:ado:access:PROVIDER=Microsoft.Jet.OLEDB.4.0;DATA SOURCE=") + - getPathFromSrc("/connectivity/qa/connectivity/ado/TS001018407.mdb"); + getPathFromWorkdir("/CppunitTest/TS001018407.mdb"); Sequence< PropertyValue > info; Reference< XDriver> xDriver(m_xAdoComponent, UNO_QUERY); |