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

limitation for windows tests

Browse Source
This commit is contained in:
Andrei Yankovich 2022-10-07 11:18:47 +03:00
parent 26eef5ae25
commit 27f7a2471c
2 changed files with 20 additions and 86 deletions

26
tests/tstMain.cpp

@ -6,6 +6,9 @@
//#
#include <QtTest>
#include "qttest.h"
#ifdef Q_OS_LINUX
#include "allowemptypackagestest.h"
#include "binprefixtest.h"
#include "checkqttest.h"
@ -35,7 +38,6 @@
#include "installdiroptionstest.h"
#include "libdirstest.h"
#include "md5test.h"
#include "MSVCtest.h"
#include "multipackingtest.h"
#include "outdirtest.h"
#include "overridingtemplatedebtest.h"
@ -51,7 +53,6 @@
#include "QIFWtest.h"
#include "qmlextracttest.h"
#include "qmlscanertest.h"
#include "qttest.h"
#include "releativelinktest.h"
#include "runscriptstest.h"
#include "settargetdirtest.h"
@ -64,6 +65,11 @@
#include "zipmultitest.h"
#include "ziptest.h"
#include "systemlibtest.h"
#endif
#ifdef Q_OS_WIN
#include "MSVCtest.h"
#endif
// Use This macros for initialize your own test classes.
// Check exampletests
@ -86,9 +92,13 @@ public:
~tstMain();
private slots:
// BEGIN TESTS CASES
// General tests for all platforms
TestCase(qttest, QtTest )
// main tests works on linux only
#ifdef Q_OS_LINUX
TestCase(allowemptypackagestest, AllowEmptyPackagesTest )
TestCase(binprefixtest, BinPrefixTest)
TestCase(checkqttest, CheckQtTest)
@ -118,7 +128,6 @@ private slots:
TestCase(installdiroptionstest, InstallDirsOptionsTest )
TestCase(libdirstest, LibDirTest )
TestCase(md5test, MD5Test )
TestCase(MSVCtest, MSVCTest )
TestCase(multipackingtest, MultiPackingTest )
TestCase(outdirtest, OutDirTest )
TestCase(overridingtemplatedebtest, OverridingDefaultTemplateDEBTest )
@ -135,7 +144,6 @@ private slots:
TestCase(QIFWtest, QIFWTest )
TestCase(qmlextracttest, QMLExtractTest )
TestCase(qmlscanertest, QmlScanerTest )
TestCase(qttest, QtTest )
TestCase(releativelinktest, ReleativeLinkTest )
TestCase(runscriptstest, RunScriptsTest )
TestCase(settargetdirtest, SetTargetDirTest )
@ -148,6 +156,12 @@ private slots:
TestCase(zipmultitest, ZIPMultiTest )
TestCase(ziptest, ZIPTest )
TestCase(systemLibTest, SystemLibTest)
#endif
// platform tests
#ifdef Q_OS_WIN
TestCase(MSVCtest, MSVCTest )
#endif
// END TEST CASES
private:

80
tests/units/systemlibtest.cpp

@ -30,25 +30,6 @@ void SystemLibTest::test() {
"./" + DISTRO_DIR + "/lib/systemLibs/libstdc++.so"
});
#else
QString bin = TestBinDir + "TestOnlyC.exe";
QString qmake = TestQtDir + "bin/qmake.exe";
auto comapareTree = utils.createTree(
{
"./" + DISTRO_DIR + "/TestOnlyC.exe",
"./" + DISTRO_DIR + "/TestOnlyC.bat",
#if defined(Q_OS_WIN64)
"./" + DISTRO_DIR + "/systemLibs/libgcc_s_seh-1.dll",
#else
"./" + DISTRO_DIR + "/systemLibs/libgcc_s_dw2-1.dll",
#endif
"./" + DISTRO_DIR + "/systemLibs/libstdc++-6.dll",
"./" + DISTRO_DIR + "/systemLibs/libwinpthread-1.dll",
"./" + DISTRO_DIR + "/systemLibs/msvcrt.dll",
"./" + DISTRO_DIR + "/qt.conf"
});
#endif
runTestParams({"-bin", bin, "clear" ,
@ -56,66 +37,5 @@ void SystemLibTest::test() {
"-qmake", qmake,
}, &comapareTree, true);
#ifdef Q_OS_WIN
bin = TestBinDir + "QtWidgetsProject.exe";
comapareTree += TestModule.qtLibs();
comapareTree -= utils.createTree(
{
"./" + DISTRO_DIR + "/TestOnlyC.exe",
"./" + DISTRO_DIR + "/TestOnlyC.bat",
#if defined(Q_OS_WIN64)
"./" + DISTRO_DIR + "/systemLibs/libgcc_s_seh-1.dll",
#else
"./" + DISTRO_DIR + "/systemLibs/libgcc_s_dw2-1.dll",
#endif
"./" + DISTRO_DIR + "/systemLibs/libstdc++-6.dll",
"./" + DISTRO_DIR + "/systemLibs/libwinpthread-1.dll",
});
comapareTree += utils.createTree(
{
"./" + DISTRO_DIR + "/systemLibs/msvcrt.dll",
"./" + DISTRO_DIR + "/qt.conf",
"./" + DISTRO_DIR + "/systemLibs/mpr.dll",
"./" + DISTRO_DIR + "/systemLibs/profapi.dll",
"./" + DISTRO_DIR + "/systemLibs/rpcrt4.dll",
"./" + DISTRO_DIR + "/systemLibs/shell32.dll",
"./" + DISTRO_DIR + "/systemLibs/userenv.dll",
"./" + DISTRO_DIR + "/systemLibs/uxtheme.dll",
"./" + DISTRO_DIR + "/systemLibs/version.dll",
"./" + DISTRO_DIR + "/systemLibs/ucrtbase.dll",
"./" + DISTRO_DIR + "/systemLibs/oleaut32.dll",
"./" + DISTRO_DIR + "/systemLibs/bcryptprimitives.dll",
"./" + DISTRO_DIR + "/systemLibs/msvcp_win.dll",
"./" + DISTRO_DIR + "/systemLibs/wtsapi32.dll",
"./" + DISTRO_DIR + "/systemLibs/combase.dll",
#if !defined(Q_OS_WIN64)
"./" + DISTRO_DIR + "/systemLibs/sspicli.dll",
"./" + DISTRO_DIR + "/systemLibs/cryptbase.dll",
#endif
});
#if QT_VERSION >= QT_VERSION_CHECK(5, 14, 0)
comapareTree += utils.createTree(
{
"./" + DISTRO_DIR + "/systemLibs/d3d11.dll",
"./" + DISTRO_DIR + "/systemLibs/dxgi.dll",
"./" + DISTRO_DIR + "/systemLibs/win32u.dll",
});
#endif
runTestParams({"-bin", bin, "clear" ,
"-qmake", qmake,
"deploySystem"
}, &comapareTree);
#endif
}