diff options
author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2014-03-24 16:10:15 +0100 |
---|---|---|
committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2014-03-24 16:10:15 +0100 |
commit | 3b5c0bc0780f1749fed7c07bd8b691400a0282b7 (patch) | |
tree | 1022f5553ad5a0aca9b5f3b49ca38a01c2329d20 /tests/auto/other/d3dcompiler/tst_d3dcompiler.cpp | |
parent | c79918733a194ebbe5a2fe1617c884659f3e4b9f (diff) | |
parent | 21f1738a94fc8544ece04b3b1ee03a11986fe59b (diff) |
Merge remote-tracking branch 'origin/stable' into dev
Conflicts:
src/gui/image/qjpeghandler.cpp
Change-Id: I9db3acea7d5c82f5da679c8eaeb29431136665f0
Diffstat (limited to 'tests/auto/other/d3dcompiler/tst_d3dcompiler.cpp')
-rw-r--r-- | tests/auto/other/d3dcompiler/tst_d3dcompiler.cpp | 18 |
1 files changed, 7 insertions, 11 deletions
diff --git a/tests/auto/other/d3dcompiler/tst_d3dcompiler.cpp b/tests/auto/other/d3dcompiler/tst_d3dcompiler.cpp index 1a34c2076b..750ea8fc4c 100644 --- a/tests/auto/other/d3dcompiler/tst_d3dcompiler.cpp +++ b/tests/auto/other/d3dcompiler/tst_d3dcompiler.cpp @@ -170,6 +170,7 @@ void tst_d3dcompiler::init() { qunsetenv("QT_D3DCOMPILER_DIR"); qunsetenv("QT_D3DCOMPILER_TIMEOUT"); + qunsetenv("QT_D3DCOMPILER_DISABLE_DLL"); } void tst_d3dcompiler::cleanup() @@ -195,8 +196,8 @@ void tst_d3dcompiler::service_data() // Don't test the default case, as it would clutter the AppData directory //QTest::newRow("default") << QByteArrayLiteral("") << true << E_ABORT; QTest::newRow("temporary") << QFile::encodeName(tempDir.path()) << true << E_ABORT; - QTest::newRow("invalid") << QByteArrayLiteral("ZZ:\\") << false << S_OK; - QTest::newRow("empty") << QByteArrayLiteral("") << false << S_OK; + QTest::newRow("invalid") << QByteArrayLiteral("ZZ:\\") << false << E_FAIL; + QTest::newRow("empty") << QByteArrayLiteral("") << false << E_FAIL; } void tst_d3dcompiler::service() @@ -205,16 +206,12 @@ void tst_d3dcompiler::service() QFETCH(bool, exists); QFETCH(HRESULT, result); qputenv("QT_D3DCOMPILER_DIR", compilerDir); + qputenv("QT_D3DCOMPILER_DISABLE_DLL", QByteArrayLiteral("1")); const QDir path = blobPath(); if (exists) { // Activate service QVERIFY(path.exists()); - - QFile control(path.absoluteFilePath(QStringLiteral("control"))); - QVERIFY(control.open(QFile::WriteOnly)); - control.close(); - QVERIFY(control.exists()); } else { QVERIFY(!path.exists()); } @@ -262,6 +259,7 @@ void tst_d3dcompiler::service() void tst_d3dcompiler::offlineCompile() { qputenv("QT_D3DCOMPILER_DIR", QFile::encodeName(tempDir.path())); + qputenv("QT_D3DCOMPILER_DISABLE_DLL", QByteArrayLiteral("1")); for (int i = 0; compilerDlls[i]; ++i) { d3dcompiler_win = loadLibrary(compilerDlls[i]); @@ -302,6 +300,8 @@ void tst_d3dcompiler::offlineCompile() void tst_d3dcompiler::onlineCompile() { qputenv("QT_D3DCOMPILER_DIR", QFile::encodeName(tempDir.path())); + qputenv("QT_D3DCOMPILER_TIMEOUT", QByteArray::number(3000)); + qputenv("QT_D3DCOMPILER_DISABLE_DLL", QByteArrayLiteral("1")); QByteArray data(hlsl); @@ -309,10 +309,6 @@ void tst_d3dcompiler::onlineCompile() // Activate service QVERIFY(path.exists()); - QFile control(path.absoluteFilePath(QStringLiteral("control"))); - QVERIFY(control.open(QFile::WriteOnly)); - control.close(); - QVERIFY(control.exists()); d3dcompiler_qt = loadLibrary(D3DCOMPILER_DLL); QVERIFY(d3dcompiler_qt); |