diff options
| author | Tamas Bunth <tamas.bunth@collabora.co.uk> | 2018-04-14 16:13:02 +0200 |
|---|---|---|
| committer | Tamás Bunth <btomi96@gmail.com> | 2018-04-14 17:44:48 +0200 |
| commit | 3bb1f0b3a8f71807c221fda22433571f9a0497d2 (patch) | |
| tree | ba115dd93458981785c308b752c794cf12547492 /dbaccess/Module_dbaccess.mk | |
| parent | c760ebc55f0d0a9838256e9dc6374d85d12ee93e (diff) | |
Revert HSQLDB related unit tests
Revert changes making HSQLDB related unit tests test Firebird migration.
They should still test the HSQLDB driver.
It reverts part of 159dd28651788a19848eae56693ad06ed947414d
Change-Id: If2b9207e95055418bd1dc1dc6e472335de311d1e
Reviewed-on: https://gerrit.libreoffice.org/52873
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Tamás Bunth <btomi96@gmail.com>
Diffstat (limited to 'dbaccess/Module_dbaccess.mk')
| -rw-r--r-- | dbaccess/Module_dbaccess.mk | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/dbaccess/Module_dbaccess.mk b/dbaccess/Module_dbaccess.mk index bbef2fc119be..a97578c02508 100644 --- a/dbaccess/Module_dbaccess.mk +++ b/dbaccess/Module_dbaccess.mk @@ -48,7 +48,7 @@ $(eval $(call gb_Module_add_check_targets,dbaccess,\ CppunitTest_dbaccess_hsqlschema_import \ )) -ifeq ($(ENABLE_FIREBIRD_SDBC),TRUE) +ifeq ($(ENABLE_JAVA),TRUE) $(eval $(call gb_Module_add_check_targets,dbaccess,\ CppunitTest_dbaccess_hsqldb_test \ CppunitTest_dbaccess_RowSetClones \ @@ -58,23 +58,20 @@ endif # This runs a suite of performance tests on embedded firebird and HSQLDB. # Instructions on running the test can be found in qa/unit/embeddedb_performancetest ifeq ($(ENABLE_FIREBIRD_SDBC),TRUE) +ifeq ($(ENABLE_JAVA),TRUE) $(eval $(call gb_Module_add_check_targets,dbaccess,\ CppunitTest_dbaccess_embeddeddb_performancetest \ )) endif - -ifeq ($(ENABLE_FIREBIRD_SDBC),TRUE) -$(eval $(call gb_Module_add_subsequentcheck_targets,dbaccess,\ - JunitTest_dbaccess_complex \ -)) endif $(eval $(call gb_Module_add_subsequentcheck_targets,dbaccess,\ + JunitTest_dbaccess_complex \ JunitTest_dbaccess_unoapi \ )) ifneq ($(DISABLE_PYTHON),TRUE) -ifneq ($(ENABLE_FIREBIRD_SDBC),) +ifneq ($(ENABLE_JAVA),) $(eval $(call gb_Module_add_subsequentcheck_targets,dbaccess,\ PythonTest_dbaccess_python \ )) |