QuasarApp/CQtDeployer
4
1
Fork 0
mirror of https://github.com/QuasarApp/CQtDeployer.git synced 2025-04-29 19:24:33 +00:00
Code Issues Projects Releases Wiki Activity

fix windows tests

Browse Source
This commit is contained in:
Andrei Yankovich 2021-04-22 12:23:50 +03:00
parent 0aee9cc1cf
commit 18adb3359e
1 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
UnitTests/tst_deploytest.cpp
View File

@ -1131,6 +1131,7 @@ void deploytest::testRunScripts() {
#ifdef Q_OS_UNIX #ifdef Q_OS_UNIX
QString bin = TestBinDir + "TestOnlyC"; QString bin = TestBinDir + "TestOnlyC";
QFile f(":/testResurces/testRes/customRunScript.sh"); QFile f(":/testResurces/testRes/customRunScript.sh");
QVERIFY(f.open(QIODevice::ReadOnly)); QVERIFY(f.open(QIODevice::ReadOnly));
auto etalonData = f.readAll(); auto etalonData = f.readAll();
@ -1148,6 +1149,7 @@ void deploytest::testRunScripts() {
QVERIFY(deployData == etalonData); QVERIFY(deployData == etalonData);
#else #else
QString bin = TestBinDir + "TestOnlyC.exe"; QString bin = TestBinDir + "TestOnlyC.exe";
QFile f(":/testResurces/testRes/customRunScript.sh"); QFile f(":/testResurces/testRes/customRunScript.sh");
QVERIFY(f.open(QIODevice::ReadOnly)); QVERIFY(f.open(QIODevice::ReadOnly));
auto etalonData = f.readAll(); auto etalonData = f.readAll();
@ -1156,7 +1158,7 @@ void deploytest::testRunScripts() {
runTestParams({"-bin", bin, runTestParams({"-bin", bin,
"force-clear", "force-clear",
"-libOut", "lib", "-libOut", "lib",
"-runScript", "TestOnlyC.exe;:/testResurces/testRes/customRunScript.sh"}, &comapareTree); "-runScript", "TestOnlyC.exe;:/testResurces/testRes/customRunScript.sh"}, nullptr);
f.setFileName(DISTRO_DIR + "/TestOnlyC.bat"); f.setFileName(DISTRO_DIR + "/TestOnlyC.bat");
QVERIFY(f.open(QIODevice::ReadOnly)); QVERIFY(f.open(QIODevice::ReadOnly));
@ -2796,6 +2798,8 @@ void deploytest::testSystemLib() {
#else #else
QString bin = TestBinDir + "TestOnlyC.exe"; QString bin = TestBinDir + "TestOnlyC.exe";
QString qmake = TestQtDir + "bin/qmake.exe";
auto comapareTree = utils.createTree( auto comapareTree = utils.createTree(
{ {
"./" + DISTRO_DIR + "/TestOnlyC.exe", "./" + DISTRO_DIR + "/TestOnlyC.exe",
@ -2810,11 +2814,11 @@ void deploytest::testSystemLib() {
#endif #endif
runTestParams({"-bin", bin, "clear" , runTestParams({"-bin", bin, "clear" ,
"deploySystem" "deploySystem",
"-qmake", qmake
}, &comapareTree); }, &comapareTree);
#ifdef Q_OS_WIN #ifdef Q_OS_WIN
QString qmake = TestQtDir + "bin/qmake.exe";
bin = TestBinDir + "QtWidgetsProject.exe"; bin = TestBinDir + "QtWidgetsProject.exe";
comapareTree += TestModule.qtLibs(); comapareTree += TestModule.qtLibs();
@ -2823,14 +2827,14 @@ void deploytest::testSystemLib() {
{ {
"./" + DISTRO_DIR + "/TestOnlyC.exe", "./" + DISTRO_DIR + "/TestOnlyC.exe",
"./" + DISTRO_DIR + "/TestOnlyC.bat", "./" + DISTRO_DIR + "/TestOnlyC.bat",
"./" + DISTRO_DIR + "/systemLibs/libgcc_s_seh-1.dll",
"./" + DISTRO_DIR + "/systemLibs/libstdc++-6.dll",
"./" + DISTRO_DIR + "/systemLibs/libwinpthread-1.dll",
}); });
comapareTree += utils.createTree( comapareTree += utils.createTree(
{ {
"./" + DISTRO_DIR + "/systemLibs/libgcc_s_seh-1.dll",
"./" + DISTRO_DIR + "/systemLibs/libstdc++-6.dll",
"./" + DISTRO_DIR + "/systemLibs/libwinpthread-1.dll",
"./" + DISTRO_DIR + "/systemLibs/msvcrt.dll", "./" + DISTRO_DIR + "/systemLibs/msvcrt.dll",
"./" + DISTRO_DIR + "/qt.conf", "./" + DISTRO_DIR + "/qt.conf",
"./" + DISTRO_DIR + "/systemLibs/mpr.dll", "./" + DISTRO_DIR + "/systemLibs/mpr.dll",