diff options
| author | Christian Kandeler <christian.kandeler@theqtcompany.com> | 2016-05-02 10:32:05 +0200 |
|---|---|---|
| committer | Christian Kandeler <christian.kandeler@theqtcompany.com> | 2016-05-02 08:41:07 +0000 |
| commit | e89a2a8767598e4525f18cc22b01b258ff325522 (patch) | |
| tree | 44e6e867b36ad008308bcd10f8cae88bd79e67c7 | |
| parent | 96a6db15c2350a4aa946417a976c95357b2be6dd (diff) | |
| download | qbs-e89a2a8767598e4525f18cc22b01b258ff325522.tar.gz | |
Remove DBus adaptor autotest for invalid input file names.
The kind of file name required to trigger such an error (all dots)
causes problems on some Windows hosts.
Change-Id: I40012878d9e373da096b9a3ae37fad782be668dd
Reviewed-by: Jake Petroules <jake.petroules@qt.io>
4 files changed, 0 insertions, 22 deletions
diff --git a/tests/auto/blackbox/testdata/dbus-adaptor-invalid/... b/tests/auto/blackbox/testdata/dbus-adaptor-invalid/... deleted file mode 100644 index e69de29bb..000000000 --- a/tests/auto/blackbox/testdata/dbus-adaptor-invalid/... +++ /dev/null diff --git a/tests/auto/blackbox/testdata/dbus-adaptor-invalid/dbus-adaptor-invalid.qbs b/tests/auto/blackbox/testdata/dbus-adaptor-invalid/dbus-adaptor-invalid.qbs deleted file mode 100644 index 47592ac50..000000000 --- a/tests/auto/blackbox/testdata/dbus-adaptor-invalid/dbus-adaptor-invalid.qbs +++ /dev/null @@ -1,9 +0,0 @@ -import qbs - -CppApplication { - Depends { name: "Qt.dbus" } - Group { - files: ["..."] - fileTags: ["qt.dbus.adaptor"] - } -} diff --git a/tests/auto/blackbox/tst_blackbox.cpp b/tests/auto/blackbox/tst_blackbox.cpp index 0ed8f79ac..b144aa096 100644 --- a/tests/auto/blackbox/tst_blackbox.cpp +++ b/tests/auto/blackbox/tst_blackbox.cpp @@ -1138,18 +1138,6 @@ void TestBlackbox::conflictingArtifacts() QVERIFY2(m_qbsStderr.contains("Conflicting artifacts"), m_qbsStderr.constData()); } -void TestBlackbox::dbusAdaptorInvalid() -{ - if (HostOsInfo::isWindowsHost()) - QSKIP("Test applies only on Unix hosts."); - QDir::setCurrent(testDataDir + "/dbus-adaptor-invalid"); - QbsRunParameters params; - params.expectFailure = true; - QVERIFY(runQbs(params) != 0); - QVERIFY2(m_qbsStderr.contains("Unsuitable") || m_qbsStderr.contains("'Qt.dbus' not found"), - m_qbsStderr.constData()); -} - void TestBlackbox::dbusAdaptors() { QDir::setCurrent(testDataDir + "/dbus-adaptors"); diff --git a/tests/auto/blackbox/tst_blackbox.h b/tests/auto/blackbox/tst_blackbox.h index ef2841924..e3a55e33f 100644 --- a/tests/auto/blackbox/tst_blackbox.h +++ b/tests/auto/blackbox/tst_blackbox.h @@ -114,7 +114,6 @@ private slots: void cli(); void concurrentExecutor(); void conflictingArtifacts(); - void dbusAdaptorInvalid(); void dbusAdaptors(); void dbusInterfaces(); void dependenciesProperty(); |