Merge branch 'testing_fixes' into 'master'

Testing fixes. Contributes to JB#22786 See merge request mer-core/buteo-syncfw!61
sailfishos · Mar 31, 2021 · 838106f · 838106f
2 parents ff4c0ed + 1d390cc
commit 838106f
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 9 deletions.
diff --git a/libbuteosyncfw/libbuteosyncfw.pro b/libbuteosyncfw/libbuteosyncfw.pro
@@ -145,11 +145,7 @@ headers.files = common/Logger.h \
            profile/SyncSchedule_p.h \
            profile/TargetResults.h
 
-utility.path = /opt/tests/buteo-syncfw
-utility.files = ../bin/*.pl \
-    ../bin/*.sh
-
-INSTALLS += target headers utility sources
+INSTALLS += target headers sources
 
 QMAKE_PKGCONFIG_DESTDIR = pkgconfig
 QMAKE_PKGCONFIG_LIBDIR  = $$target.path

diff --git a/libbuteosyncfw/profile/TargetResults.cpp b/libbuteosyncfw/profile/TargetResults.cpp
@@ -316,7 +316,9 @@ QList<QString> TargetResults::localDetails(Buteo::TargetResults::ItemOperation a
         return ItemDetails::filterStatus(d_ptr->iLocalDeletions, aStatus);
     case ITEM_MODIFIED:
         return ItemDetails::filterStatus(d_ptr->iLocalModifications, aStatus);
-    };
+    }
+
+    return QList<QString>();
 }
 
 QString TargetResults::localMessage(const QString &aUid) const

diff --git a/rpm/buteo-syncfw-qt5.spec b/rpm/buteo-syncfw-qt5.spec
@@ -103,7 +103,6 @@ make doc %{_smp_mflags}
 
 %install
 make INSTALL_ROOT=%{buildroot} install
-chmod +x %{buildroot}/opt/tests/buteo-syncfw/*.pl %{buildroot}/opt/tests/buteo-syncfw/*.sh
 %fdupes %{buildroot}/opt/tests/buteo-syncfw/
 mkdir -p %{buildroot}%{_userunitdir}/user-session.target.wants
 ln -s ../msyncd.service %{buildroot}%{_userunitdir}/user-session.target.wants/

diff --git a/unittests/tests/runstarget.sh b/unittests/tests/runstarget.sh
@@ -21,7 +21,8 @@ cd "${TMP_DIR}"
 export LD_LIBRARY_PATH="${TESTS_DIR}:${LD_LIBRARY_PATH}"
 
 # Accept both absolute and relative path to test executable
-TEST="$(cd "${TESTS_DIR}"; readlink -f "${1}")"
+TESTDIR=$(cd "${TESTS_DIR}"; readlink -f "${1}")
+TEST=$(basename ${1})
 shift
 
-exec "${TEST}" "${@}" -maxwarnings 0
+exec "${TESTDIR}/${TEST}" "${@}" -maxwarnings 0