[Pkg-owncloud-commits] [owncloud-client] 05/07: FTBFS: Tests failures

[Sandro Knauß]

This is an automated email from the git hooks/post-receive script.

hefee pushed a commit to branch master
in repository owncloud-client.

commit 6f5e04e92c5577329a98643ff606647187e3f910
Author: Sandro Knauß <hefee at debian.org>
Date:   Sat Nov 19 14:37:24 2016 +0100

    FTBFS: Tests failures
    
    Closes: 844937
---
 debian/patches/0011-fix-tests.patch | 86 +++++++++++++++++++++++++++++++++++++
 debian/patches/series               |  1 +
 2 files changed, 87 insertions(+)

diff --git a/debian/patches/0011-fix-tests.patch b/debian/patches/0011-fix-tests.patch
new file mode 100644
index 0000000..1892a2f
--- /dev/null
+++ b/debian/patches/0011-fix-tests.patch
@@ -0,0 +1,86 @@
+Description: cleanup tests so they passes in Debian.
+ We can use the C++ paramenter OWNCLOUD_BIN_DIR directly.
+Author: Sandro Knauß <hefee at debian.org>
+Origin: Debian
+Bug-Debian: https://bugs.debian.org/844937
+Forwarded: https://github.com/owncloud/client/pull/5326
+Last-Update: 2016-11-19
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+--- a/test/owncloud_add_test.cmake
++++ b/test/owncloud_add_test.cmake
+@@ -21,6 +21,6 @@ macro(owncloud_add_test test_class addit
+     )
+ 
+     add_definitions(-DOWNCLOUD_TEST)
+-    add_definitions(-DOWNCLOUD_BIN_PATH=${CMAKE_BINARY_DIR}/bin)
++    add_definitions(-DOWNCLOUD_BIN_PATH="${CMAKE_BINARY_DIR}/bin")
+     add_test(NAME ${OWNCLOUD_TEST_CLASS}Test COMMAND ${OWNCLOUD_TEST_CLASS}Test)
+ endmacro()
+--- a/test/testexcludedfiles.cpp
++++ b/test/testexcludedfiles.cpp
+@@ -6,15 +6,12 @@
+  */
+ 
+ #include <QtTest>
++#include <QDebug>
+ 
+ #include "excludedfiles.h"
+ 
+ using namespace OCC;
+ 
+-#define STR_(X) #X
+-#define STR(X) STR_(X)
+-#define BIN_PATH STR(OWNCLOUD_BIN_PATH)
+-
+ class TestExcludedFiles: public QObject
+ {
+     Q_OBJECT
+@@ -26,13 +23,12 @@ private slots:
+         bool excludeHidden = true;
+         bool keepHidden = false;
+ 
+-        bool x = excluded.isExcluded("/a/b", "/a", keepHidden);
+         QVERIFY(!excluded.isExcluded("/a/b", "/a", keepHidden));
+         QVERIFY(!excluded.isExcluded("/a/b~", "/a", keepHidden));
+         QVERIFY(!excluded.isExcluded("/a/.b", "/a", keepHidden));
+         QVERIFY(excluded.isExcluded("/a/.b", "/a", excludeHidden));
+ 
+-        QString path(BIN_PATH);
++        QString path(OWNCLOUD_BIN_PATH);
+         path.append("/sync-exclude.lst");
+         excluded.addExcludeFilePath(path);
+         excluded.reloadExcludes();
+@@ -40,9 +36,9 @@ private slots:
+         QVERIFY(!excluded.isExcluded("/a/b", "/a", keepHidden));
+         QVERIFY(excluded.isExcluded("/a/b~", "/a", keepHidden));
+         QVERIFY(!excluded.isExcluded("/a/.b", "/a", keepHidden));
++        QVERIFY(excluded.isExcluded("/a/.b", "/a", excludeHidden));
+         QVERIFY(excluded.isExcluded("/a/.Trashes", "/a", keepHidden));
+         QVERIFY(excluded.isExcluded("/a/foo_conflict-bar", "/a", keepHidden));
+-        QVERIFY(excluded.isExcluded("/a/.b", "/a", excludeHidden));
+     }
+ };
+ 
+--- a/test/testutility.cpp
++++ b/test/testutility.cpp
+@@ -8,10 +8,6 @@
+ 
+ #include "utility.h"
+ 
+-#define STR_(X) #X
+-#define STR(X) STR_(X)
+-#define BIN_PATH STR(OWNCLOUD_BIN_PATH)
+-
+ using namespace OCC::Utility;
+ 
+ class TestUtility : public QObject
+@@ -123,7 +119,7 @@ private slots:
+             }
+             // pass the binary name owncloud to the next call. This brakes branding,
+             // but branding is not supposed to work with this.
+-            QString ver = versionOfInstalledBinary(BIN_PATH+QLatin1String("/owncloud"));
++            QString ver = versionOfInstalledBinary(OWNCLOUD_BIN_PATH+QLatin1String("/owncloud"));
+ 	    qDebug() << "Version of installed ownCloud Binary: " << ver;
+ 	    QVERIFY( !ver.isEmpty());
+ 
diff --git a/debian/patches/series b/debian/patches/series
index 207c13f..6d4e054 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -8,3 +8,4 @@
 0008-make-reproducable.patch
 0009-fix-installpath-of-dolphin-plugin.patch
 0010-fix-build-with-openssl1.1.0b.patch
+0011-fix-tests.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-owncloud/owncloud-client.git