diff options
author | kh <karsten.heimrich@theqtcompany.com> | 2014-11-18 16:39:28 +0100 |
---|---|---|
committer | Karsten Heimrich <karsten.heimrich@theqtcompany.com> | 2014-11-18 16:40:18 +0100 |
commit | 6a38cb8df826216b7de356c3c7c7a92bdb3a6e03 (patch) | |
tree | f01b61ade5cd5f1312a49777a16ded33c40e6a93 /tests | |
parent | b5206decd82ee10be00460b6c3ba3f6f9d1c2b6c (diff) |
Remove Qt SDK specific operations
Change-Id: I0a06c4b019dc6799447adef6d722be36ab3ded5d
Reviewed-by: Karsten Heimrich <karsten.heimrich@theqtcompany.com>
Diffstat (limited to 'tests')
-rw-r--r-- | tests/auto/installer/consumeoutputoperationtest/tst_consumeoutputoperationtest.cpp | 44 |
1 files changed, 0 insertions, 44 deletions
diff --git a/tests/auto/installer/consumeoutputoperationtest/tst_consumeoutputoperationtest.cpp b/tests/auto/installer/consumeoutputoperationtest/tst_consumeoutputoperationtest.cpp index 538513939..ec595bdd7 100644 --- a/tests/auto/installer/consumeoutputoperationtest/tst_consumeoutputoperationtest.cpp +++ b/tests/auto/installer/consumeoutputoperationtest/tst_consumeoutputoperationtest.cpp @@ -36,7 +36,6 @@ #include <consumeoutputoperation.h> #include <qinstallerglobal.h> #include <fileutils.h> -#include <qtpatchoperation.h> #include <errors.h> #include <QObject> @@ -59,28 +58,12 @@ class tst_consumeoutputoperationtest : public QObject private slots: void initTestCase() { -#if defined(Q_OS_WIN) - m_binSuffix = ".exe"; -#endif // be aware that this would enable eating the qDebug output //QInstaller::init(); - // if we don't use the init method we need to register the in QtPatchOperation used - // patch_file_lists manually -#if defined(QT_STATIC) - Q_INIT_RESOURCE(patch_file_lists); -#endif m_fakeQtPath = QDir::toNativeSeparators(qApp->applicationDirPath()) + QDir::separator() + "fakeQt" + QDir::separator(); QVERIFY(QDir().mkpath(m_fakeQtPath + "bin")); - - QFile orgQmake(QUOTE(QMAKE_BINARY)); - // use lrelease filename which will be patched by the QtPatch operation, but it hides that this - // fake Qt contains a qmake which would be used to get the patch paths (instead of using the qmake - // output we want to use our installer value) - m_binaryInFakeQt = m_fakeQtPath + "bin" + QDir::separator() + "lrelease" + m_binSuffix; - - QVERIFY2(orgQmake.copy(m_binaryInFakeQt), qPrintable(orgQmake.errorString())); } void testMissingArguments() @@ -115,31 +98,6 @@ private slots: QCOMPARE(m_core.value("testConsumeOutputKey"), testOutput); } - void testPatchFakeQt() - { - return; -#if defined(Q_OS_WIN) - QString patchType = "windows"; -#elif defined(Q_OS_OSX) - QString patchType = "mac"; -#else - QString patchType = "linux"; -#endif - - QtPatchOperation patchOperation; - patchOperation.setValue(QLatin1String("installer"), QVariant::fromValue(&m_core)); - - // testConsumeOutputKey comes from testGetOutputFromQmake() before and it can not use qmake, - // because it does not exist in the m_fakeQtPath - patchOperation.setArguments(QStringList() << "QmakeOutputInstallerKey=testConsumeOutputKey" - << patchType << m_fakeQtPath); - QVERIFY2(patchOperation.performOperation(), qPrintable(patchOperation.errorString())); - - QString patchedBinaryOutput = getOutputFrom(m_binaryInFakeQt, QStringList("-query")); - QVERIFY(getOutputFrom(QUOTE(QMAKE_BINARY), QStringList("-query")) != patchedBinaryOutput); - QVERIFY(patchedBinaryOutput.contains(m_fakeQtPath)); - } - void cleanupTestCase() { try { @@ -167,8 +125,6 @@ private: PackageManagerCore m_core; QString m_fakeQtPath; - QString m_binaryInFakeQt; - QString m_binSuffix; }; QTEST_MAIN(tst_consumeoutputoperationtest) |