From 34785c61d8c6d76997b1ec9f4ef5746a2066fd65 Mon Sep 17 00:00:00 2001 From: J-P Nurmi Date: Thu, 5 May 2016 21:25:03 +0200 Subject: tests: skip material/BoxShadow.qml and material/ElevationEffect.qml These are not standalone controls, but internal helper types. They are tested and benchmarked together with the enclosing control, just like the various indicator types. Change-Id: I41b756b5f60dbd25719707da5372e13184092748 Reviewed-by: Mitch Curtis --- tests/benchmarks/creationtime/tst_creationtime.cpp | 2 +- tests/benchmarks/objectcount/tst_objectcount.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'tests/benchmarks') diff --git a/tests/benchmarks/creationtime/tst_creationtime.cpp b/tests/benchmarks/creationtime/tst_creationtime.cpp index e5a4491a..877cf273 100644 --- a/tests/benchmarks/creationtime/tst_creationtime.cpp +++ b/tests/benchmarks/creationtime/tst_creationtime.cpp @@ -133,7 +133,7 @@ void tst_CreationTime::material() void tst_CreationTime::material_data() { QTest::addColumn("url"); - addTestRows(&engine, "controls/material", "QtQuick/Controls.2/Material", QStringList() << "Ripple" << "SliderHandle" << "CheckIndicator" << "RadioIndicator" << "SwitchIndicator"); + addTestRows(&engine, "controls/material", "QtQuick/Controls.2/Material", QStringList() << "Ripple" << "SliderHandle" << "CheckIndicator" << "RadioIndicator" << "SwitchIndicator" << "BoxShadow" << "ElevationEffect"); } void tst_CreationTime::universal() diff --git a/tests/benchmarks/objectcount/tst_objectcount.cpp b/tests/benchmarks/objectcount/tst_objectcount.cpp index b673fe3c..554b8af1 100644 --- a/tests/benchmarks/objectcount/tst_objectcount.cpp +++ b/tests/benchmarks/objectcount/tst_objectcount.cpp @@ -189,7 +189,7 @@ void tst_ObjectCount::material() void tst_ObjectCount::material_data() { QTest::addColumn("url"); - addTestRows(&engine, "controls/material", "QtQuick/Controls.2/Material", QStringList() << "Ripple" << "SliderHandle" << "CheckIndicator" << "RadioIndicator" << "SwitchIndicator"); + addTestRows(&engine, "controls/material", "QtQuick/Controls.2/Material", QStringList() << "Ripple" << "SliderHandle" << "CheckIndicator" << "RadioIndicator" << "SwitchIndicator" << "BoxShadow" << "ElevationEffect"); } void tst_ObjectCount::universal() -- cgit v1.2.3