Merged develop into feature

--HG--
branch : feature
This commit is contained in:
Bojan Kverh 2016-07-25 19:01:07 +02:00
commit 8aabd5a8d9
7 changed files with 37 additions and 10 deletions

24
bitbucket-pipelines.yml Normal file
View file

@ -0,0 +1,24 @@
image: gcc
pipelines:
default:
- step:
script:
- echo "This script runs on all branches that don't have any specific pipeline assigned in 'branches'."
branches:
develop:
- step:
script:
- cat /etc/*-release
- uname -a
- grep -i processor /proc/cpuinfo | wc -l
- gcc --version
- apt-get update # required to install qt
- 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
- qmake ../Valentina.pro -r CONFIG+=noDebugSymbols CONFIG+=no_ccache CONFIG+=checkWarnings
- make -j$(nproc)
- export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:"/opt/atlassian/bitbucketci/agent/build/build/src/libs/vpropertyexplorer/bin:/opt/atlassian/bitbucketci/agent/build/build/src/libs/qmuparser/bin"
# QTestLib require GUI support for some tests
- xvfb-run -a make check

View file

@ -240,7 +240,7 @@ GCC_DEBUG_CXXFLAGS += \
-Wredundant-decls \
# -Winline \
-Winvalid-pch \
-Wunsafe-loop-optimizations \
# -Wunsafe-loop-optimizations \
-Wlong-long \
-Wmissing-format-attribute \
-Wswitch-default \

View file

@ -140,6 +140,7 @@ bool AbstractTest::CopyRecursively(const QString &srcFilePath, const QString &tg
targetDir.cdUp();
if (not targetDir.mkdir(QFileInfo(tgtFilePath).fileName()))
{
QWARN("Can't create subdir./n");
return false;
}
QDir sourceDir(srcFilePath);
@ -154,10 +155,12 @@ bool AbstractTest::CopyRecursively(const QString &srcFilePath, const QString &tg
return false;
}
}
} else
}
else
{
if (not QFile::copy(srcFilePath, tgtFilePath))
{
QWARN("Can't copy file./n");
return false;
}
}

View file

@ -40,7 +40,7 @@ TST_TapeCommandLine::TST_TapeCommandLine(QObject *parent)
}
//---------------------------------------------------------------------------------------------------------------------
void TST_TapeCommandLine::init()
void TST_TapeCommandLine::initTestCase()
{
QDir tmpDir(tmpTestFolder);
if (not tmpDir.removeRecursively())
@ -141,7 +141,7 @@ void TST_TapeCommandLine::OpenMeasurements()
}
//---------------------------------------------------------------------------------------------------------------------
void TST_TapeCommandLine::cleanup()
void TST_TapeCommandLine::cleanupTestCase()
{
QDir tmpDir(tmpTestFolder);
if (not tmpDir.removeRecursively())

View file

@ -38,10 +38,10 @@ public:
explicit TST_TapeCommandLine(QObject *parent = nullptr);
private slots:
void init();
void initTestCase();
void OpenMeasurements_data() const;
void OpenMeasurements();
void cleanup();
void cleanupTestCase();
private:
Q_DISABLE_COPY(TST_TapeCommandLine)

View file

@ -41,7 +41,7 @@ TST_ValentinaCommandLine::TST_ValentinaCommandLine(QObject *parent)
//---------------------------------------------------------------------------------------------------------------------
// cppcheck-suppress unusedFunction
void TST_ValentinaCommandLine::init()
void TST_ValentinaCommandLine::initTestCase()
{
{// Test files
QDir tmpDir(tmpTestFolder);
@ -308,7 +308,7 @@ void TST_ValentinaCommandLine::TestOpenCollection()
//---------------------------------------------------------------------------------------------------------------------
// cppcheck-suppress unusedFunction
void TST_ValentinaCommandLine::cleanup()
void TST_ValentinaCommandLine::cleanupTestCase()
{
{
QDir tmpDir(tmpTestFolder);

View file

@ -38,7 +38,7 @@ public:
explicit TST_ValentinaCommandLine(QObject *parent = nullptr);
private slots:
void init();
void initTestCase();
void OpenPatterns_data() const;
void OpenPatterns();
void ExportMode_data() const;
@ -47,7 +47,7 @@ private slots:
void TestMode();
void TestOpenCollection_data() const;
void TestOpenCollection();
void cleanup();
void cleanupTestCase();
private:
Q_DISABLE_COPY(TST_ValentinaCommandLine)