dbaccess/JunitTest_dbaccess_complex.mk | 10 +++++-----
dbaccess/JunitTest_dbaccess_unoapi.mk | 8 ++++----
2 files changed, 9 insertions(+), 9 deletions(-)
New commits:
commit 5bce80add81dea7b241e8593fee8bf25cb80c4e1
Author: Stephan Bergmann <sberg...@redhat.com>
Date: Tue Oct 30 10:52:36 2012 +0100
Properly spell out "dbaccess"
...so that these tests also work from a toplevel make.
Change-Id: I82899ce6f1760b34b365ee5cfacbadb1f40de766
diff --git a/dbaccess/JunitTest_dbaccess_complex.mk
b/dbaccess/JunitTest_dbaccess_complex.mk
index fd1511e..bd8358e 100644
--- a/dbaccess/JunitTest_dbaccess_complex.mk
+++ b/dbaccess/JunitTest_dbaccess_complex.mk
@@ -7,9 +7,9 @@
# 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 \
OOoRunner \
jurt \
@@ -18,17 +18,17 @@ $(eval $(call gb_JunitTest_use_jars,dba_ju_complex,\
unoil \
))
-$(eval $(call gb_JunitTest_set_defs,dba_ju_complex,\
+$(eval $(call gb_JunitTest_set_defs,dbaccess_ju_complex,\
$$(DEFS) \
-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.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/Beamer \
dbaccess/qa/complex/dbaccess/CRMBasedTestCase \
diff --git a/dbaccess/JunitTest_dbaccess_unoapi.mk
b/dbaccess/JunitTest_dbaccess_unoapi.mk
index 5897697..f948229 100644
--- a/dbaccess/JunitTest_dbaccess_unoapi.mk
+++ b/dbaccess/JunitTest_dbaccess_unoapi.mk
@@ -26,16 +26,16 @@
# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
# 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) \
-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.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 \
jurt \
ridl \
@@ -43,7 +43,7 @@ $(eval $(call gb_JunitTest_use_jars,dba_ju_unoapi,\
unoil \
))
-$(eval $(call gb_JunitTest_add_classes,dba_ju_unoapi,\
+$(eval $(call gb_JunitTest_add_classes,dbaccess_ju_unoapi,\
org.openoffice.test.UnoApiTest \
))
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
