[Libreoffice-commits] core.git: dbaccess/CppunitTest_dbaccess_firebird_regression_test.mk dbaccess/CppunitTest_dbaccess_firebird_test.mk

Caolán McNamara (via logerrit) logerrit at kemper.freedesktop.org
Thu Jun 10 12:07:38 UTC 2021


 dbaccess/CppunitTest_dbaccess_firebird_regression_test.mk |   18 +++++++-------
 dbaccess/CppunitTest_dbaccess_firebird_test.mk            |   18 +++++++-------
 2 files changed, 18 insertions(+), 18 deletions(-)

New commits:
commit 5d684acf33b6244c5eba332da7419e20126f1a08
Author:     Caolán McNamara <caolanm at redhat.com>
AuthorDate: Thu Jun 10 10:26:31 2021 +0100
Commit:     Caolán McNamara <caolanm at redhat.com>
CommitDate: Thu Jun 10 14:06:45 2021 +0200

    fix firebird Cppunit targets
    
    so
    
    make CppunitTest_dbaccess_firebird_test
    make CppunitTest_dbaccess_firebird_regression_test
    
    work
    
    which is presumably a problem since...
    
    Commit 36befb3aca96907a14e71e82497dbb8f03ead5ab
    Date:   Sun Sep 23 19:40:59 2018 +0200
    
        tdf#72987 split firebird test into a regression test and a "new" test
    
    Change-Id: I3509364ba496c01c4a8a53674ec1c65495210274
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/116969
    Tested-by: Caolán McNamara <caolanm at redhat.com>
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/dbaccess/CppunitTest_dbaccess_firebird_regression_test.mk b/dbaccess/CppunitTest_dbaccess_firebird_regression_test.mk
index 654d2f6168cc..c9d0f0f2ea44 100644
--- a/dbaccess/CppunitTest_dbaccess_firebird_regression_test.mk
+++ b/dbaccess/CppunitTest_dbaccess_firebird_regression_test.mk
@@ -7,15 +7,15 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 #
 
-$(eval $(call gb_CppunitTest_CppunitTest,dbaccess_firebird_regression))
+$(eval $(call gb_CppunitTest_CppunitTest,dbaccess_firebird_regression_test))
 
-$(eval $(call gb_CppunitTest_use_external,dbaccess_firebird_regression,boost_headers))
+$(eval $(call gb_CppunitTest_use_external,dbaccess_firebird_regression_test,boost_headers))
 
-$(eval $(call gb_CppunitTest_add_exception_objects,dbaccess_firebird_regression, \
+$(eval $(call gb_CppunitTest_add_exception_objects,dbaccess_firebird_regression_test, \
     dbaccess/qa/unit/firebird-regression \
 ))
 
-$(eval $(call gb_CppunitTest_use_libraries,dbaccess_firebird_regression, \
+$(eval $(call gb_CppunitTest_use_libraries,dbaccess_firebird_regression_test, \
     comphelper \
     cppu \
     dbaxml \
@@ -29,16 +29,16 @@ $(eval $(call gb_CppunitTest_use_libraries,dbaccess_firebird_regression, \
     xo \
 ))
 
-$(eval $(call gb_CppunitTest_use_api,dbaccess_firebird_regression,\
+$(eval $(call gb_CppunitTest_use_api,dbaccess_firebird_regression_test,\
     offapi \
     oovbaapi \
     udkapi \
 ))
 
-$(eval $(call gb_CppunitTest_use_ure,dbaccess_firebird_regression))
-$(eval $(call gb_CppunitTest_use_vcl,dbaccess_firebird_regression))
+$(eval $(call gb_CppunitTest_use_ure,dbaccess_firebird_regression_test))
+$(eval $(call gb_CppunitTest_use_vcl,dbaccess_firebird_regression_test))
 
-$(eval $(call gb_CppunitTest_use_components,dbaccess_firebird_regression,\
+$(eval $(call gb_CppunitTest_use_components,dbaccess_firebird_regression_test,\
     basic/util/sb \
     comphelper/util/comphelp \
     configmgr/source/configmgr \
@@ -65,6 +65,6 @@ $(eval $(call gb_CppunitTest_use_components,dbaccess_firebird_regression,\
     xmloff/util/xo \
 ))
 
-$(eval $(call gb_CppunitTest_use_configuration,dbaccess_firebird_regression))
+$(eval $(call gb_CppunitTest_use_configuration,dbaccess_firebird_regression_test))
 
 # vim: set noet sw=4 ts=4:
diff --git a/dbaccess/CppunitTest_dbaccess_firebird_test.mk b/dbaccess/CppunitTest_dbaccess_firebird_test.mk
index 88592d922cbd..5065520993e2 100644
--- a/dbaccess/CppunitTest_dbaccess_firebird_test.mk
+++ b/dbaccess/CppunitTest_dbaccess_firebird_test.mk
@@ -7,15 +7,15 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 #
 
-$(eval $(call gb_CppunitTest_CppunitTest,dbaccess_firebird))
+$(eval $(call gb_CppunitTest_CppunitTest,dbaccess_firebird_test))
 
-$(eval $(call gb_CppunitTest_use_external,dbaccess_firebird,boost_headers))
+$(eval $(call gb_CppunitTest_use_external,dbaccess_firebird_test,boost_headers))
 
-$(eval $(call gb_CppunitTest_add_exception_objects,dbaccess_firebird, \
+$(eval $(call gb_CppunitTest_add_exception_objects,dbaccess_firebird_test, \
     dbaccess/qa/unit/firebird \
 ))
 
-$(eval $(call gb_CppunitTest_use_libraries,dbaccess_firebird, \
+$(eval $(call gb_CppunitTest_use_libraries,dbaccess_firebird_test, \
     comphelper \
     cppu \
     dbaxml \
@@ -29,16 +29,16 @@ $(eval $(call gb_CppunitTest_use_libraries,dbaccess_firebird, \
     xo \
 ))
 
-$(eval $(call gb_CppunitTest_use_api,dbaccess_firebird,\
+$(eval $(call gb_CppunitTest_use_api,dbaccess_firebird_test,\
     offapi \
     oovbaapi \
     udkapi \
 ))
 
-$(eval $(call gb_CppunitTest_use_ure,dbaccess_firebird))
-$(eval $(call gb_CppunitTest_use_vcl,dbaccess_firebird))
+$(eval $(call gb_CppunitTest_use_ure,dbaccess_firebird_test))
+$(eval $(call gb_CppunitTest_use_vcl,dbaccess_firebird_test))
 
-$(eval $(call gb_CppunitTest_use_components,dbaccess_firebird,\
+$(eval $(call gb_CppunitTest_use_components,dbaccess_firebird_test,\
     basic/util/sb \
     comphelper/util/comphelp \
     configmgr/source/configmgr \
@@ -65,6 +65,6 @@ $(eval $(call gb_CppunitTest_use_components,dbaccess_firebird,\
     xmloff/util/xo \
 ))
 
-$(eval $(call gb_CppunitTest_use_configuration,dbaccess_firebird))
+$(eval $(call gb_CppunitTest_use_configuration,dbaccess_firebird_test))
 
 # vim: set noet sw=4 ts=4:


More information about the Libreoffice-commits mailing list