From e5cbf86ef25fecba7fa227175350211778a36978 Mon Sep 17 00:00:00 2001 From: Roman Telezhynskyi Date: Thu, 28 Jul 2016 11:38:30 +0300 Subject: [PATCH] Tring restore bitbucket pipeline. Fixing locale is wrong way. Try get error sting about copying. --HG-- branch : develop --- bitbucket-pipelines.yml | 6 +----- src/test/ValentinaTest/abstracttest.cpp | 6 ++++-- 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/bitbucket-pipelines.yml b/bitbucket-pipelines.yml index 02e21f4fd..ca612ce6a 100644 --- a/bitbucket-pipelines.yml +++ b/bitbucket-pipelines.yml @@ -13,11 +13,7 @@ pipelines: - grep -i processor /proc/cpuinfo | wc -l - gcc --version - apt-get update # required to install qt - - apt-get install -y locales xvfb qtbase5-dev libqt5svg5-dev qt5-default qttools5-dev-tools libqt5xmlpatterns5-dev libqt5core5a libqt5gui5 libqt5printsupport5 libqt5svg5 libqt5widgets5 libqt5xml5 libqt5xmlpatterns5 xpdf - - locale - - echo "en_US.UTF-8 UTF-8" >> /etc/locale.gen - - locale-gen "en_US.UTF-8" - - update-locale LANG=en_US.UTF-8 LC_CTYPE=en_US.UTF-8 + - apt-get install -y xvfb qtbase5-dev libqt5svg5-dev qt5-default qttools5-dev-tools libqt5xmlpatterns5-dev libqt5core5a libqt5gui5 libqt5printsupport5 libqt5svg5 libqt5widgets5 libqt5xml5 libqt5xmlpatterns5 xpdf - mkdir build - cd build - qmake --version diff --git a/src/test/ValentinaTest/abstracttest.cpp b/src/test/ValentinaTest/abstracttest.cpp index 920b396a9..89f12ac69 100644 --- a/src/test/ValentinaTest/abstracttest.cpp +++ b/src/test/ValentinaTest/abstracttest.cpp @@ -176,9 +176,11 @@ bool AbstractTest::CopyRecursively(const QString &srcFilePath, const QString &tg } } - if (not QFile::copy(srcFilePath, tgtFilePath)) + QFile srcFile(srcFilePath); + if (not srcFile.copy(tgtFilePath)) { - const QString msg = QString("Can't copy file '%1' to '%2'.").arg(srcFilePath).arg(tgtFilePath); + const QString msg = QString("Can't copy file '%1' to '%2'. Error: %3").arg(srcFilePath).arg(tgtFilePath) + .arg(srcFile.errorString()); QWARN(qUtf8Printable(msg)); return false; }