QuasarApp/CQtDeployer
4
1
Fork 0
mirror of https://github.com/QuasarApp/CQtDeployer.git synced 2025-05-06 22:49:35 +00:00
Code Issues Projects Releases Wiki Activity

support of all tests

Browse Source
This commit is contained in:
Andrei Yankovich 2020-02-27 21:01:32 +03:00
parent 7a3ebb003d
commit 102bbd6909
3 changed files with 6 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
CQtDeployer.pro
View File

@ -17,11 +17,7 @@ CONFIG += ordered
tests/TestQtWidgets \ tests/TestQtWidgets \
tests/TestQMLWidgets tests/TestQMLWidgets
unix:SUBDIRS += tests/quicknanobrowser
contains(DEFINES, WITH_ALL_TESTS) {
SUBDIRS += tests/quicknanobrowser
}
contains(DEFINES, WITHOUT_TESTS) { contains(DEFINES, WITHOUT_TESTS) {
SUBDIRS -= UnitTests \ SUBDIRS -= UnitTests \

3
UnitTests/modulesqt514.cpp
View File

@ -149,7 +149,8 @@ QSet<QString> ModulesQt514::qtWebEngine()
"./" + DISTRO_DIR + "/qml/QtQml/WorkerScript.2/libworkerscriptplugin.so", "./" + DISTRO_DIR + "/qml/QtQml/WorkerScript.2/libworkerscriptplugin.so",
"./" + DISTRO_DIR + "/qml/QtQml/WorkerScript.2/plugins.qmltypes", "./" + DISTRO_DIR + "/qml/QtQml/WorkerScript.2/plugins.qmltypes",
"./" + DISTRO_DIR + "/qml/QtQml/WorkerScript.2/qmldir", "./" + DISTRO_DIR + "/qml/QtQml/WorkerScript.2/qmldir",
"./" + DISTRO_DIR + "/qml/QtQml/libqmlplugin.so" "./" + DISTRO_DIR + "/qml/QtQml/libqmlplugin.so",
"./" + DISTRO_DIR + "/translations/qtwebengine_ca.qm"
}); });
#endif #endif
return res; return res;

19
UnitTests/tst_deploytest.cpp
View File

@ -474,8 +474,6 @@ void deploytest::testMSVC() {
void deploytest::testEmptyParamsString() { void deploytest::testEmptyParamsString() {
TestUtils utils; TestUtils utils;
#ifdef WITH_ALL_TESTS
QDir("./" + DISTRO_DIR).removeRecursively(); QDir("./" + DISTRO_DIR).removeRecursively();
auto comapareTree = Modules::testEmptyParamsTree(); auto comapareTree = Modules::testEmptyParamsTree();
@ -496,28 +494,17 @@ void deploytest::testEmptyParamsString() {
comapareTree = utils.createTree({}); comapareTree = utils.createTree({});
runTestParams({"clear", "-targetDir", "./testDeployDir"}, &comapareTree); runTestParams({"clear", "-targetDir", "./testDeployDir"}, &comapareTree);
#endif
} }
void deploytest::testWebEngine() { void deploytest::testWebEngine() {
#ifdef WITH_ALL_TESTS #ifdef Q_OS_UNIX
TestUtils utils; TestUtils utils;
#ifdef Q_OS_UNIX
QString bin = TestBinDir + "quicknanobrowser"; QString bin = TestBinDir + "quicknanobrowser";
QString qmake = TestQtDir + "bin/qmake"; QString qmake = TestQtDir + "bin/qmake";
#else
QString bin = TestBinDir + "quicknanobrowser.exe";
QString qmake = TestQtDir + "bin/qmake.exe";
#endif
auto comapareTree = Modules::qtWebEngine(); auto comapareTree = Modules::qtWebEngine();
runTestParams({"-bin", bin, "clear" , runTestParams({"-bin", bin, "clear" ,
"-qmake", qmake, "-qmake", qmake,
"-qmlDir", TestBinDir + "/../quicknanobrowser"}, &comapareTree); "-qmlDir", TestBinDir + "/../quicknanobrowser"}, &comapareTree);
@ -1141,7 +1128,7 @@ void deploytest::testBinDir() {
"./" + DISTRO_DIR + "/qt.conf"}); "./" + DISTRO_DIR + "/qt.conf"});
#endif #endif
#ifdef WITH_ALL_TESTS #ifdef Q_OS_UNIX
comapareTree += utils.createTree( comapareTree += utils.createTree(
{"./" + DISTRO_DIR + "/bin/quicknanobrowser", {"./" + DISTRO_DIR + "/bin/quicknanobrowser",
"./" + DISTRO_DIR + "/quicknanobrowser.sh"}); "./" + DISTRO_DIR + "/quicknanobrowser.sh"});
@ -1176,7 +1163,7 @@ void deploytest::testConfFile() {
"./" + DISTRO_DIR + "/TestQMLWidgets.exe"}); "./" + DISTRO_DIR + "/TestQMLWidgets.exe"});
#endif #endif
#ifdef WITH_ALL_TESTS #ifdef Q_OS_UNIX
comapareTree += utils.createTree( comapareTree += utils.createTree(
{"./" + DISTRO_DIR + "/bin/quicknanobrowser", {"./" + DISTRO_DIR + "/bin/quicknanobrowser",
"./" + DISTRO_DIR + "/quicknanobrowser.sh"}); "./" + DISTRO_DIR + "/quicknanobrowser.sh"});