diff options
author | Laszlo Agocs <laszlo.agocs@theqtcompany.com> | 2015-06-22 18:54:16 +0200 |
---|---|---|
committer | Simon Hausmann <simon.hausmann@theqtcompany.com> | 2015-06-23 04:08:41 +0000 |
commit | d40647922b1b8542d36fd3a2496740d6e66343c7 (patch) | |
tree | 04f1febd6a3d9fdb4018006745e56b3f6e43795d /tests/auto/gui/qopenglconfig | |
parent | 9e139ce0993f11115639426982873becdd87cc10 (diff) |
Revert "windows: Disable D3D9/11 with ANGLE in VMs"
This reverts commit a6000e2b6679d91c9dab44e49b485de6816372bc.
Temporarily remove this to unblock the qtdeclarative dev CI.
While Windows 8 VMs are fixed by this patch, Windows 7 has different
problems.
Change-Id: I45ef064ed953cc4b7bbf19657300d4fc43d82452
Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
Diffstat (limited to 'tests/auto/gui/qopenglconfig')
-rw-r--r-- | tests/auto/gui/qopenglconfig/buglist.json | 11 | ||||
-rw-r--r-- | tests/auto/gui/qopenglconfig/tst_qopenglconfig.cpp | 9 |
2 files changed, 1 insertions, 19 deletions
diff --git a/tests/auto/gui/qopenglconfig/buglist.json b/tests/auto/gui/qopenglconfig/buglist.json index 8a48180977..c7b8e61bc8 100644 --- a/tests/auto/gui/qopenglconfig/buglist.json +++ b/tests/auto/gui/qopenglconfig/buglist.json @@ -103,17 +103,6 @@ ] }, { - "id": 7, - "description": "driver description test", - "driver_description": "Test", - "os": { - "type": "win" - }, - "features": [ - "feature2" - ] - }, - { "id": 128, "description": "check for matching GL_VENDOR", "gl_vendor": "The Qt Company", diff --git a/tests/auto/gui/qopenglconfig/tst_qopenglconfig.cpp b/tests/auto/gui/qopenglconfig/tst_qopenglconfig.cpp index fc3daee585..f88cbdc758 100644 --- a/tests/auto/gui/qopenglconfig/tst_qopenglconfig.cpp +++ b/tests/auto/gui/qopenglconfig/tst_qopenglconfig.cpp @@ -244,20 +244,13 @@ void tst_QOpenGlConfig::testBugList() expectedFeatures << "feature1"; QVersionNumber driverVersion(QVector<int>() << 9 << 18 << 13 << 4460); - QOpenGLConfig::Gpu gpu = QOpenGLConfig::Gpu::fromDevice(0x10DE, 0x0DE9, driverVersion, QByteArrayLiteral("Unknown")); + QOpenGLConfig::Gpu gpu = QOpenGLConfig::Gpu::fromDevice(0x10DE, 0x0DE9, driverVersion); QSet<QString> actualFeatures = QOpenGLConfig::gpuFeatures(gpu, QStringLiteral("win"), QVersionNumber(6, 3), fileName); QVERIFY2(expectedFeatures == actualFeatures, msgSetMismatch(expectedFeatures, actualFeatures)); - gpu = QOpenGLConfig::Gpu::fromDevice(0xDEAD, 0xBEEF, driverVersion, QByteArrayLiteral("Test")); - actualFeatures = QOpenGLConfig::gpuFeatures(gpu, QStringLiteral("win"), - QVersionNumber(6, 3), fileName); - expectedFeatures = QSet<QString>() << "feature2"; - QVERIFY2(expectedFeatures == actualFeatures, - msgSetMismatch(expectedFeatures, actualFeatures)); - gpu = QOpenGLConfig::Gpu::fromGLVendor(QByteArrayLiteral("Somebody Else")); expectedFeatures.clear(); actualFeatures = QOpenGLConfig::gpuFeatures(gpu, QStringLiteral("linux"), |