diff options
author | Paul Lemire <paul.lemire@kdab.com> | 2019-04-03 14:38:34 +0200 |
---|---|---|
committer | Liang Qi <liang.qi@qt.io> | 2019-04-25 12:02:24 +0000 |
commit | 9b140ccba930f159443a70a81eb1d2585b6070f9 (patch) | |
tree | fefcd2cde685a2da67ba71cd9bacfc6d2e07f4ee /tests | |
parent | 276be935bfeccde733bacd4267abeb978f6efda5 (diff) |
Disable ShaderBuilder unit tests
To allow Qt base QShaderGenerator changes to be merged
Change-Id: I26088ccf55b510b5eb845c583c0551ccfd817eb7
Task-number: QTBUG-75384
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
Diffstat (limited to 'tests')
-rw-r--r-- | tests/auto/render/shaderbuilder/tst_shaderbuilder.cpp | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/tests/auto/render/shaderbuilder/tst_shaderbuilder.cpp b/tests/auto/render/shaderbuilder/tst_shaderbuilder.cpp index 007bfac7c..a7c81ca20 100644 --- a/tests/auto/render/shaderbuilder/tst_shaderbuilder.cpp +++ b/tests/auto/render/shaderbuilder/tst_shaderbuilder.cpp @@ -474,6 +474,7 @@ private slots: void shouldHandleShaderCodeGeneration() { + QSKIP("Disabled for Qt Base QShaderGenerator Integration"); // GIVEN Qt3DRender::Render::ShaderBuilder::setPrototypesFile(":/prototypes.json"); QVERIFY(!Qt3DRender::Render::ShaderBuilder::getPrototypeNames().isEmpty()); @@ -562,6 +563,8 @@ private slots: void checkCodeUpdatedNotification() { // GIVEN + QSKIP("Disabled for Qt Base QShaderGenerator Integration"); + Qt3DRender::Render::ShaderBuilder::setPrototypesFile(":/prototypes.json"); QVERIFY(!Qt3DRender::Render::ShaderBuilder::getPrototypeNames().isEmpty()); QFETCH(Qt3DRender::Render::ShaderBuilder::ShaderType, type); |