[Libreoffice-commits] core.git: config_host.mk.in configure.ac dbaccess/Module_dbaccess.mk dbaccess/qa

Libreoffice Gerrit user logerrit at kemper.freedesktop.org
Wed Oct 3 08:12:58 UTC 2018


 config_host.mk.in             |    1 +
 configure.ac                  |    7 +++++++
 dbaccess/Module_dbaccess.mk   |    7 ++++++-
 dbaccess/qa/unit/firebird.cxx |   12 ++++++++++--
 4 files changed, 24 insertions(+), 3 deletions(-)

New commits:
commit f104b3cafee63b47a735cfdce0f05dab2eedbb91
Author:     Rene Engelhard <rene at debian.org>
AuthorDate: Fri Sep 28 23:02:17 2018 +0200
Commit:     Rene Engelhard <rene at debian.org>
CommitDate: Wed Oct 3 10:12:34 2018 +0200

    tdf#72987 run firebird test for little endian only for now
    
    since those old(er) files still use the endianness-depending format.
    And remove x64 from the filename...
    
    Change-Id: I24e56cd8561c2ec6a1f77a66907c14cdea8248b6
    Reviewed-on: https://gerrit.libreoffice.org/60916
    Tested-by: Jenkins
    Reviewed-by: Rene Engelhard <rene at debian.org>

diff --git a/config_host.mk.in b/config_host.mk.in
index a7fc587c5570..62b95390de45 100644
--- a/config_host.mk.in
+++ b/config_host.mk.in
@@ -180,6 +180,7 @@ export ENABLE_SYMBOLS=@ENABLE_SYMBOLS@
 export ENABLE_VALGRIND=@ENABLE_VALGRIND@
 export ENABLE_VLC=@ENABLE_VLC@
 export ENABLE_WERROR=@ENABLE_WERROR@
+export ENDIANNESS=@ENDIANNESS@
 export EPM=@EPM@
 export EPM_FLAGS=@EPM_FLAGS@
 export EPUBGEN_CFLAGS=$(gb_SPACE)@EPUBGEN_CFLAGS@
diff --git a/configure.ac b/configure.ac
index 86eef4c0c32a..5f0f7080bced 100644
--- a/configure.ac
+++ b/configure.ac
@@ -812,6 +812,13 @@ haiku*)
     ;;
 esac
 
+if test "$_os" != "WINNT"; then
+AC_C_BIGENDIAN([ENDIANNESS=big], [ENDIANNESS=little])
+else
+ENDIANNESS=little
+fi
+AC_SUBST(ENDIANNESS)
+
 if test "$_os" = "Android" ; then
     # Verify that the NDK and SDK options are proper
     if test -z "$with_android_ndk"; then
diff --git a/dbaccess/Module_dbaccess.mk b/dbaccess/Module_dbaccess.mk
index bedf3f22296d..ca96629bdafe 100644
--- a/dbaccess/Module_dbaccess.mk
+++ b/dbaccess/Module_dbaccess.mk
@@ -35,9 +35,14 @@ $(eval $(call gb_Module_add_l10n_targets,dbaccess,\
 ifneq ($(OS),IOS)
 ifeq ($(ENABLE_FIREBIRD_SDBC),TRUE)
 $(eval $(call gb_Module_add_check_targets,dbaccess,\
-    CppunitTest_dbaccess_firebird_test \
     $(if,$(ENABLE_JAVA),CppunitTest_dbaccess_hsqlbinary_import) \
 ))
+# remove if we have a be file for this
+ifeq ($(ENDIANNESS),little)
+$(eval $(call gb_Module_add_check_targets,dbaccess,\
+    CppunitTest_dbaccess_firebird_test \
+))
+endif
 endif
 
 $(eval $(call gb_Module_add_check_targets,dbaccess,\
diff --git a/dbaccess/qa/unit/data/firebird_empty.odb b/dbaccess/qa/unit/data/firebird_empty_le.odb
similarity index 100%
rename from dbaccess/qa/unit/data/firebird_empty.odb
rename to dbaccess/qa/unit/data/firebird_empty_le.odb
diff --git a/dbaccess/qa/unit/data/firebird_integer_x64le.odb b/dbaccess/qa/unit/data/firebird_integer_le.odb
similarity index 100%
rename from dbaccess/qa/unit/data/firebird_integer_x64le.odb
rename to dbaccess/qa/unit/data/firebird_integer_le.odb
diff --git a/dbaccess/qa/unit/data/firebird_integer_x64le_ods12.odb b/dbaccess/qa/unit/data/firebird_integer_le_ods12.odb
similarity index 100%
rename from dbaccess/qa/unit/data/firebird_integer_x64le_ods12.odb
rename to dbaccess/qa/unit/data/firebird_integer_le_ods12.odb
diff --git a/dbaccess/qa/unit/firebird.cxx b/dbaccess/qa/unit/firebird.cxx
index db907d857b45..610caf69d785 100644
--- a/dbaccess/qa/unit/firebird.cxx
+++ b/dbaccess/qa/unit/firebird.cxx
@@ -42,7 +42,11 @@ public:
  */
 void FirebirdTest::testEmptyDBConnection()
 {
-    auto const tmp = createTempCopy("firebird_empty.odb");
+#ifdef OSL_BIGENDIAN
+// FIXME
+#else
+    auto const tmp = createTempCopy("firebird_empty_le.odb");
+#endif
     uno::Reference< XOfficeDatabaseDocument > xDocument =
         getDocumentForUrl(tmp.GetURL());
 
@@ -57,8 +61,12 @@ void FirebirdTest::testEmptyDBConnection()
  */
 void FirebirdTest::testIntegerDatabase()
 {
+#ifdef OSL_BIGENDIAN
+// FIXME
+#else
     uno::Reference< XOfficeDatabaseDocument > xDocument =
-        getDocumentForFileName("firebird_integer_x64le_ods12.odb");
+        getDocumentForFileName("firebird_integer_le_ods12.odb");
+#endif
 
     uno::Reference< XConnection > xConnection =
         getConnectionForDocument(xDocument);


More information about the Libreoffice-commits mailing list