Kaydet (Commit) 5bce80ad authored tarafından Stephan Bergmann's avatar Stephan Bergmann

Properly spell out "dbaccess"

...so that these tests also work from a toplevel make.

Change-Id: I82899ce6f1760b34b365ee5cfacbadb1f40de766
üst e6abcd4f
...@@ -7,9 +7,9 @@ ...@@ -7,9 +7,9 @@
# 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_JunitTest_JunitTest,dba_ju_complex)) $(eval $(call gb_JunitTest_JunitTest,dbaccess_ju_complex))
$(eval $(call gb_JunitTest_use_jars,dba_ju_complex,\ $(eval $(call gb_JunitTest_use_jars,dbaccess_ju_complex,\
ConnectivityTools \ ConnectivityTools \
OOoRunner \ OOoRunner \
jurt \ jurt \
...@@ -18,17 +18,17 @@ $(eval $(call gb_JunitTest_use_jars,dba_ju_complex,\ ...@@ -18,17 +18,17 @@ $(eval $(call gb_JunitTest_use_jars,dba_ju_complex,\
unoil \ unoil \
)) ))
$(eval $(call gb_JunitTest_set_defs,dba_ju_complex,\ $(eval $(call gb_JunitTest_set_defs,dbaccess_ju_complex,\
$$(DEFS) \ $$(DEFS) \
-Dorg.openoffice.test.arg.tdoc=$(SRCDIR)/dbaccess/qa/dbaccess \ -Dorg.openoffice.test.arg.tdoc=$(SRCDIR)/dbaccess/qa/dbaccess \
)) ))
$(eval $(call gb_JunitTest_add_classes,dba_ju_complex,\ $(eval $(call gb_JunitTest_add_classes,dbaccess_ju_complex,\
complex.dbaccess.Beamer \ complex.dbaccess.Beamer \
complex.dbaccess.PropertyBag \ complex.dbaccess.PropertyBag \
)) ))
$(eval $(call gb_JunitTest_add_sourcefiles,dba_ju_complex,\ $(eval $(call gb_JunitTest_add_sourcefiles,dbaccess_ju_complex,\
dbaccess/qa/complex/dbaccess/ApplicationController \ dbaccess/qa/complex/dbaccess/ApplicationController \
dbaccess/qa/complex/dbaccess/Beamer \ dbaccess/qa/complex/dbaccess/Beamer \
dbaccess/qa/complex/dbaccess/CRMBasedTestCase \ dbaccess/qa/complex/dbaccess/CRMBasedTestCase \
......
...@@ -26,16 +26,16 @@ ...@@ -26,16 +26,16 @@
# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable # in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
# instead of those above. # instead of those above.
$(eval $(call gb_JunitTest_JunitTest,dba_ju_unoapi)) $(eval $(call gb_JunitTest_JunitTest,dbaccess_ju_unoapi))
$(eval $(call gb_JunitTest_set_defs,dba_ju_unoapi,\ $(eval $(call gb_JunitTest_set_defs,dbaccess_ju_unoapi,\
$$(DEFS) \ $$(DEFS) \
-Dorg.openoffice.test.arg.sce=$(SRCDIR)/dbaccess/qa/unoapi/dbaccess.sce \ -Dorg.openoffice.test.arg.sce=$(SRCDIR)/dbaccess/qa/unoapi/dbaccess.sce \
-Dorg.openoffice.test.arg.xcl=$(SRCDIR)/dbaccess/qa/unoapi/knownissues.xcl \ -Dorg.openoffice.test.arg.xcl=$(SRCDIR)/dbaccess/qa/unoapi/knownissues.xcl \
-Dorg.openoffice.test.arg.tdoc=$(SRCDIR)/dbaccess/qa/unoapi/testdocuments \ -Dorg.openoffice.test.arg.tdoc=$(SRCDIR)/dbaccess/qa/unoapi/testdocuments \
)) ))
$(eval $(call gb_JunitTest_use_jars,dba_ju_unoapi,\ $(eval $(call gb_JunitTest_use_jars,dbaccess_ju_unoapi,\
OOoRunner \ OOoRunner \
jurt \ jurt \
ridl \ ridl \
...@@ -43,7 +43,7 @@ $(eval $(call gb_JunitTest_use_jars,dba_ju_unoapi,\ ...@@ -43,7 +43,7 @@ $(eval $(call gb_JunitTest_use_jars,dba_ju_unoapi,\
unoil \ unoil \
)) ))
$(eval $(call gb_JunitTest_add_classes,dba_ju_unoapi,\ $(eval $(call gb_JunitTest_add_classes,dbaccess_ju_unoapi,\
org.openoffice.test.UnoApiTest \ org.openoffice.test.UnoApiTest \
)) ))
......
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