qiurui
/
qtdeclarative
mirror of https://github.com/qt/qtdeclarative.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Changed quick tests to work from install directory 

- Changed tests to use TESTDATA
- added check for cross_compile option to skip when sources not available

Change-Id: I1f382794ff982bbc07fc20438a4e4a8c8b8d565f
Reviewed-by: Michael Brasser <michael.brasser@nokia.com>
Reviewed-by: Jason McDonald <jason.mcdonald@nokia.com>
This commit is contained in:
Kurt Korbatits 2012-03-06 14:48:21 +10:00 committed by Qt by Nokia
parent 65764c0334
commit 72f4ccecf4
44 changed files with 55 additions and 125 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tests/auto/quick/examples/examples.pro
View File

@ -8,3 +8,5 @@ DEFINES += SRCDIR=\\\"$$PWD\\\"
CONFIG += parallel_test CONFIG += parallel_test
#temporary #temporary
QT += core-private gui-private qml-private quick-private widgets-private v8-private testlib QT += core-private gui-private qml-private quick-private widgets-private v8-private testlib
cross_compile: DEFINES += QTEST_CROSS_COMPILED

8
tests/auto/quick/examples/tst_examples.cpp
View File

@ -237,6 +237,10 @@ void tst_examples::sgexamples()
{ {
QFETCH(QString, file); QFETCH(QString, file);
#if defined(QTEST_CROSS_COMPILED)
QSKIP("sources not available when cross compiled");
#endif
QQmlComponent component(&engine, QUrl::fromLocalFile(file)); QQmlComponent component(&engine, QUrl::fromLocalFile(file));
if (component.status() == QQmlComponent::Error) if (component.status() == QQmlComponent::Error)
qWarning() << component.errors(); qWarning() << component.errors();
@ -274,6 +278,10 @@ void tst_examples::sgsnippets()
{ {
QFETCH(QString, file); QFETCH(QString, file);
#if defined(QTEST_CROSS_COMPILED)
QSKIP("sources not available when cross compiled");
#endif
QQmlComponent component(&engine, QUrl::fromLocalFile(file)); QQmlComponent component(&engine, QUrl::fromLocalFile(file));
if (component.status() == QQmlComponent::Error) if (component.status() == QQmlComponent::Error)
qWarning() << component.errors(); qWarning() << component.errors();

4
tests/auto/quick/qquickaccessible/qquickaccessible.pro
View File

@ -8,13 +8,13 @@ SOURCES += tst_qquickaccessible.cpp
include (../../shared/util.pri) include (../../shared/util.pri)
TESTDATA = data/*
OTHER_FILES += data/checkbuttons.qml OTHER_FILES += data/checkbuttons.qml
OTHER_FILES += data/hittest.qml OTHER_FILES += data/hittest.qml
OTHER_FILES += data/pushbutton.qml OTHER_FILES += data/pushbutton.qml
OTHER_FILES += data/statictext.qml OTHER_FILES += data/statictext.qml
DEFINES += SRCDIR=\\\"$$PWD\\\"
CONFIG += parallel_test CONFIG += parallel_test
wince*: { wince*: {

6
tests/auto/quick/qquickaccessible/tst_qquickaccessible.cpp
View File

@ -129,8 +129,8 @@ void tst_QQuickAccessible::commonTests_data()
{ {
QTest::addColumn<QString>("accessibleRoleFileName"); QTest::addColumn<QString>("accessibleRoleFileName");
QTest::newRow("StaticText") << SRCDIR "/data/statictext.qml"; QTest::newRow("StaticText") << "statictext.qml";
QTest::newRow("PushButton") << SRCDIR "/data/pushbutton.qml"; QTest::newRow("PushButton") << "pushbutton.qml";
} }
void tst_QQuickAccessible::commonTests() void tst_QQuickAccessible::commonTests()
@ -141,7 +141,7 @@ void tst_QQuickAccessible::commonTests()
QQuickView *view = new QQuickView(); QQuickView *view = new QQuickView();
// view->setFixedSize(240,320); // view->setFixedSize(240,320);
view->setSource(QUrl::fromLocalFile(accessibleRoleFileName)); view->setSource(testFileUrl(accessibleRoleFileName));
view->show(); view->show();
// view->setFocus(); // view->setFocus();
QVERIFY(view->rootObject() != 0); QVERIFY(view->rootObject() != 0);

4
tests/auto/quick/qquickanchors/qquickanchors.pro
View File

@ -7,9 +7,7 @@ include (../shared/util.pri)
macx:CONFIG -= app_bundle macx:CONFIG -= app_bundle
testDataFiles.files = data TESTDATA = data/*
testDataFiles.path = .
DEPLOYMENT += testDataFiles
CONFIG += parallel_test CONFIG += parallel_test

4
tests/auto/quick/qquickanimatedimage/qquickanimatedimage.pro
View File

@ -8,9 +8,7 @@ include (../../shared/util.pri)
macx:CONFIG -= app_bundle macx:CONFIG -= app_bundle
testDataFiles.files = data TESTDATA = data/*
testDataFiles.path = .
DEPLOYMENT += testDataFiles
CONFIG += parallel_test CONFIG += parallel_test

4
tests/auto/quick/qquickanimatedsprite/qquickanimatedsprite.pro
View File

@ -6,9 +6,7 @@ include (../../shared/util.pri)
macx:CONFIG -= app_bundle macx:CONFIG -= app_bundle
testDataFiles.files = data TESTDATA = data/*
testDataFiles.path = .
DEPLOYMENT += testDataFiles
CONFIG += parallel_test CONFIG += parallel_test

4
tests/auto/quick/qquickanimationcontroller/qquickanimationcontroller.pro
View File

@ -5,6 +5,4 @@ TARGET=tst_qquickanimationcontroller
CONFIG += warn_on qmltestcase CONFIG += warn_on qmltestcase
SOURCES += tst_qquickanimationcontroller.cpp SOURCES += tst_qquickanimationcontroller.cpp
importFiles.files = data TESTDATA = data/*
importFiles.path = .
DEPLOYMENT += importFiles

4
tests/auto/quick/qquickanimations/qquickanimations.pro
View File

@ -6,9 +6,7 @@ include (../../shared/util.pri)
macx:CONFIG -= app_bundle macx:CONFIG -= app_bundle
testDataFiles.files = data TESTDATA = data/*
testDataFiles.path = .
DEPLOYMENT += testDataFiles
CONFIG += parallel_test CONFIG += parallel_test

4
tests/auto/quick/qquickbehaviors/qquickbehaviors.pro
View File

@ -6,9 +6,7 @@ include (../../shared/util.pri)
macx:CONFIG -= app_bundle macx:CONFIG -= app_bundle
testDataFiles.files = data TESTDATA = data/*
testDataFiles.path = .
DEPLOYMENT += testDataFiles
CONFIG += parallel_test CONFIG += parallel_test

4
tests/auto/quick/qquickborderimage/qquickborderimage.pro
View File

@ -8,9 +8,7 @@ SOURCES += tst_qquickborderimage.cpp \
include (../../shared/util.pri) include (../../shared/util.pri)
testDataFiles.files = data TESTDATA = data/*
testDataFiles.path = .
DEPLOYMENT += testDataFiles
CONFIG += parallel_test CONFIG += parallel_test

4
tests/auto/quick/qquickcanvas/qquickcanvas.pro
View File

@ -9,9 +9,7 @@ macx:CONFIG -= app_bundle
CONFIG += parallel_test CONFIG += parallel_test
QT += core-private gui-private qml-private quick-private testlib QT += core-private gui-private qml-private quick-private testlib
testData.files = data TESTDATA = data/*
testData.path = .
DEPLOYMENT += testData
OTHER_FILES += \ OTHER_FILES += \
data/AnimationsWhileHidden.qml \ data/AnimationsWhileHidden.qml \

4
tests/auto/quick/qquickcanvasitem/qquickcanvasitem.pro
View File

@ -5,9 +5,7 @@ TARGET=tst_qquickcanvasitem
CONFIG += warn_on qmltestcase CONFIG += warn_on qmltestcase
SOURCES += tst_qquickcanvasitem.cpp SOURCES += tst_qquickcanvasitem.cpp
importFiles.files = data TESTDATA = data/*
importFiles.path = .
DEPLOYMENT += importFiles
OTHER_FILES += \ OTHER_FILES += \
data/testhelper.js \ data/testhelper.js \

4
tests/auto/quick/qquickflickable/qquickflickable.pro
View File

@ -7,9 +7,7 @@ SOURCES += tst_qquickflickable.cpp
include (../../shared/util.pri) include (../../shared/util.pri)
include (../shared/util.pri) include (../shared/util.pri)
testDataFiles.files = data TESTDATA = data/*
testDataFiles.path = .
DEPLOYMENT += testDataFiles
CONFIG += parallel_test CONFIG += parallel_test
QT += core-private gui-private v8-private qml-private quick-private testlib QT += core-private gui-private v8-private qml-private quick-private testlib

4
tests/auto/quick/qquickflipable/qquickflipable.pro
View File

@ -6,9 +6,7 @@ SOURCES += tst_qquickflipable.cpp
include (../../shared/util.pri) include (../../shared/util.pri)
testDataFiles.files = data TESTDATA = data/*
testDataFiles.path = .
DEPLOYMENT += testDataFiles
CONFIG += parallel_test CONFIG += parallel_test

4
tests/auto/quick/qquickfocusscope/qquickfocusscope.pro
View File

@ -7,8 +7,6 @@ include (../shared/util.pri)
macx:CONFIG -= app_bundle macx:CONFIG -= app_bundle
testDataFiles.files = data TESTDATA = data/*
testDataFiles.path = .
DEPLOYMENT += testDataFiles
QT += core-private gui-private qml-private quick-private testlib QT += core-private gui-private qml-private quick-private testlib

4
tests/auto/quick/qquickfontloader/qquickfontloader.pro
View File

@ -8,9 +8,7 @@ SOURCES += tst_qquickfontloader.cpp \
include (../../shared/util.pri) include (../../shared/util.pri)
testDataFiles.files = data TESTDATA = data/*
testDataFiles.path = .
DEPLOYMENT += testDataFiles
CONFIG += parallel_test CONFIG += parallel_test

4
tests/auto/quick/qquickgridview/qquickgridview.pro
View File

@ -7,9 +7,7 @@ SOURCES += tst_qquickgridview.cpp
include (../../shared/util.pri) include (../../shared/util.pri)
include (../shared/util.pri) include (../shared/util.pri)
testDataFiles.files = data TESTDATA = data/*
testDataFiles.path = .
DEPLOYMENT += testDataFiles
CONFIG += parallel_test CONFIG += parallel_test
QT += core-private gui-private v8-private qml-private quick-private opengl-private testlib widgets QT += core-private gui-private v8-private qml-private quick-private opengl-private testlib widgets

4
tests/auto/quick/qquickimage/qquickimage.pro
View File

@ -9,9 +9,7 @@ SOURCES += tst_qquickimage.cpp \
include (../../shared/util.pri) include (../../shared/util.pri)
include (../shared/util.pri) include (../shared/util.pri)
testDataFiles.files = data TESTDATA = data/*
testDataFiles.path = .
DEPLOYMENT += testDataFiles
CONFIG += parallel_test CONFIG += parallel_test
QT += core-private gui-private qml-private quick-private network testlib QT += core-private gui-private qml-private quick-private network testlib

4
tests/auto/quick/qquickitem/qquickitem.pro
View File

@ -6,9 +6,7 @@ include (../../shared/util.pri)
macx:CONFIG -= app_bundle macx:CONFIG -= app_bundle
testDataFiles.files = data TESTDATA = data/*
testDataFiles.path = .
DEPLOYMENT += testDataFiles
CONFIG += parallel_test CONFIG += parallel_test
QT += core-private gui-private v8-private qml-private quick-private widgets testlib QT += core-private gui-private v8-private qml-private quick-private widgets testlib

4
tests/auto/quick/qquickitem2/qquickitem2.pro
View File

@ -6,9 +6,7 @@ SOURCES += tst_qquickitem.cpp
include (../../shared/util.pri) include (../../shared/util.pri)
testDataFiles.files = data TESTDATA = data/*
testDataFiles.path = .
DEPLOYMENT += testDataFiles
CONFIG += parallel_test CONFIG += parallel_test

4
tests/auto/quick/qquickitemlayer/qquickitemlayer.pro
View File

@ -4,9 +4,7 @@ SOURCES += tst_qquickitemlayer.cpp
macx:CONFIG -= app_bundle macx:CONFIG -= app_bundle
testDataFiles.files = data TESTDATA = data/*
testDataFiles.path = .
DEPLOYMENT += testDataFiles
include(../../shared/util.pri) include(../../shared/util.pri)

4
tests/auto/quick/qquicklistview/qquicklistview.pro
View File

@ -9,8 +9,6 @@ SOURCES += tst_qquicklistview.cpp \
include (../../shared/util.pri) include (../../shared/util.pri)
include (../shared/util.pri) include (../shared/util.pri)
testDataFiles.files = data TESTDATA = data/*
testDataFiles.path = .
DEPLOYMENT += testDataFiles
QT += core-private gui-private qml-private quick-private widgets widgets-private v8-private opengl-private testlib QT += core-private gui-private qml-private quick-private widgets widgets-private v8-private opengl-private testlib

4
tests/auto/quick/qquickloader/qquickloader.pro
View File

@ -10,9 +10,7 @@ SOURCES += tst_qquickloader.cpp \
include (../../shared/util.pri) include (../../shared/util.pri)
testDataFiles.files = data TESTDATA = data/*
testDataFiles.path = .
DEPLOYMENT += testDataFiles
CONFIG += parallel_test CONFIG += parallel_test

4
tests/auto/quick/qquickmousearea/qquickmousearea.pro
View File

@ -8,9 +8,7 @@ SOURCES += tst_qquickmousearea.cpp \
include (../../shared/util.pri) include (../../shared/util.pri)
testDataFiles.files = data TESTDATA = data/*
testDataFiles.path = .
DEPLOYMENT += testDataFiles
CONFIG += parallel_test CONFIG += parallel_test

4
tests/auto/quick/qquickmultipointtoucharea/qquickmultipointtoucharea.pro
View File

@ -4,8 +4,6 @@ macx:CONFIG -= app_bundle
SOURCES += tst_qquickmultipointtoucharea.cpp SOURCES += tst_qquickmultipointtoucharea.cpp
importFiles.files = data TESTDATA = data/*
importFiles.path = .
DEPLOYMENT += importFiles
QT += core-private gui-private qml-private quick-private testlib QT += core-private gui-private qml-private quick-private testlib

4
tests/auto/quick/qquickpath/qquickpath.pro
View File

@ -6,9 +6,7 @@ SOURCES += tst_qquickpath.cpp
include (../../shared/util.pri) include (../../shared/util.pri)
testDataFiles.files = data TESTDATA = data/*
testDataFiles.path = .
DEPLOYMENT += testDataFiles
CONFIG += parallel_test CONFIG += parallel_test

4
tests/auto/quick/qquickpathview/qquickpathview.pro
View File

@ -7,9 +7,7 @@ SOURCES += tst_qquickpathview.cpp
include (../../shared/util.pri) include (../../shared/util.pri)
include (../shared/util.pri) include (../shared/util.pri)
testDataFiles.files = data TESTDATA = data/*
testDataFiles.path = .
DEPLOYMENT += testDataFiles
CONFIG += parallel_test CONFIG += parallel_test
QT += core-private gui-private v8-private qml-private quick-private widgets testlib QT += core-private gui-private v8-private qml-private quick-private widgets testlib

4
tests/auto/quick/qquickpincharea/qquickpincharea.pro
View File

@ -6,9 +6,7 @@ SOURCES += tst_qquickpincharea.cpp
include (../../shared/util.pri) include (../../shared/util.pri)
testDataFiles.files = data TESTDATA = data/*
testDataFiles.path = .
DEPLOYMENT += testDataFiles
CONFIG += parallel_test CONFIG += parallel_test

4
tests/auto/quick/qquickpixmapcache/qquickpixmapcache.pro
View File

@ -9,9 +9,7 @@ INCLUDEPATH += ../../shared/
include (../../shared/util.pri) include (../../shared/util.pri)
importFiles.files = data TESTDATA = data/*
importFiles.path = .
DEPLOYMENT += importFiles
# QMAKE_CXXFLAGS = -fprofile-arcs -ftest-coverage # QMAKE_CXXFLAGS = -fprofile-arcs -ftest-coverage
# LIBS += -lgcov # LIBS += -lgcov

4
tests/auto/quick/qquickpositioners/qquickpositioners.pro
View File

@ -7,9 +7,7 @@ include (../../shared/util.pri)
macx:CONFIG -= app_bundle macx:CONFIG -= app_bundle
testDataFiles.files = data TESTDATA = data/*
testDataFiles.path = .
DEPLOYMENT += testDataFiles
CONFIG += parallel_test CONFIG += parallel_test
QT += core-private gui-private v8-private qml-private quick-private opengl-private testlib QT += core-private gui-private v8-private qml-private quick-private opengl-private testlib

4
tests/auto/quick/qquickrepeater/qquickrepeater.pro
View File

@ -7,9 +7,7 @@ SOURCES += tst_qquickrepeater.cpp
include (../../shared/util.pri) include (../../shared/util.pri)
include (../shared/util.pri) include (../shared/util.pri)
testFiles.files = data TESTDATA = data/*
testFiles.path = .
DEPLOYMENT += testFiles
CONFIG += parallel_test CONFIG += parallel_test
QT += core-private gui-private qml-private quick-private testlib QT += core-private gui-private qml-private quick-private testlib

4
tests/auto/quick/qquicksmoothedanimation/qquicksmoothedanimation.pro
View File

@ -6,9 +6,7 @@ SOURCES += tst_qquicksmoothedanimation.cpp
include (../../shared/util.pri) include (../../shared/util.pri)
testDataFiles.files = data TESTDATA = data/*
testDataFiles.path = .
DEPLOYMENT += testDataFiles
CONFIG += parallel_test CONFIG += parallel_test

4
tests/auto/quick/qquickspringanimation/qquickspringanimation.pro
View File

@ -6,9 +6,7 @@ SOURCES += tst_qquickspringanimation.cpp
include (../../shared/util.pri) include (../../shared/util.pri)
testDataFiles.files = data TESTDATA = data/*
testDataFiles.path = .
DEPLOYMENT += testDataFiles
CONFIG += parallel_test CONFIG += parallel_test

4
tests/auto/quick/qquickspriteimage/qquickspriteimage.pro
View File

@ -6,9 +6,7 @@ include (../../shared/util.pri)
macx:CONFIG -= app_bundle macx:CONFIG -= app_bundle
testDataFiles.files = data TESTDATA = data/*
testDataFiles.path = .
DEPLOYMENT += testDataFiles
CONFIG += parallel_test CONFIG += parallel_test

4
tests/auto/quick/qquickspritesequence/qquickspritesequence.pro
View File

@ -6,9 +6,7 @@ include (../../shared/util.pri)
macx:CONFIG -= app_bundle macx:CONFIG -= app_bundle
testDataFiles.files = data TESTDATA = data/*
testDataFiles.path = .
DEPLOYMENT += testDataFiles
CONFIG += parallel_test CONFIG += parallel_test

4
tests/auto/quick/qquickstates/qquickstates.pro
View File

@ -6,9 +6,7 @@ SOURCES += tst_qquickstates.cpp
include (../../shared/util.pri) include (../../shared/util.pri)
testDataFiles.files = data TESTDATA = data/*
testDataFiles.path = .
DEPLOYMENT += testDataFiles
CONFIG += parallel_test CONFIG += parallel_test
QT += core-private gui-private v8-private qml-private quick-private opengl-private testlib QT += core-private gui-private v8-private qml-private quick-private opengl-private testlib

4
tests/auto/quick/qquicktext/qquicktext.pro
View File

@ -10,9 +10,7 @@ SOURCES += ../../shared/testhttpserver.cpp
include (../../shared/util.pri) include (../../shared/util.pri)
testDataFiles.files = data TESTDATA = data/*
testDataFiles.path = .
DEPLOYMENT += testDataFiles
CONFIG += parallel_test CONFIG += parallel_test

4
tests/auto/quick/qquicktextedit/qquicktextedit.pro
View File

@ -9,8 +9,6 @@ HEADERS += ../../shared/testhttpserver.h
include (../../shared/util.pri) include (../../shared/util.pri)
testDataFiles.files = data TESTDATA = data/*
testDataFiles.path = .
DEPLOYMENT += testDataFiles
QT += core-private gui-private v8-private qml-private quick-private opengl-private network widgets-private testlib QT += core-private gui-private v8-private qml-private quick-private opengl-private network widgets-private testlib

4
tests/auto/quick/qquicktextinput/qquicktextinput.pro
View File

@ -6,8 +6,6 @@ SOURCES += tst_qquicktextinput.cpp
include (../../shared/util.pri) include (../../shared/util.pri)
testDataFiles.files = data TESTDATA = data/*
testDataFiles.path = .
DEPLOYMENT += testDataFiles
QT += core-private gui-private v8-private qml-private quick-private opengl-private testlib QT += core-private gui-private v8-private qml-private quick-private opengl-private testlib

4
tests/auto/quick/qquickview/qquickview.pro
View File

@ -6,8 +6,6 @@ SOURCES += tst_qquickview.cpp
include (../../shared/util.pri) include (../../shared/util.pri)
testDataFiles.files = data TESTDATA = data/*
testDataFiles.path = .
DEPLOYMENT += testDataFiles
QT += core-private gui-private qml-private quick-private testlib QT += core-private gui-private qml-private quick-private testlib

4
tests/auto/quick/qquickvisualdatamodel/qquickvisualdatamodel.pro
View File

@ -7,9 +7,7 @@ SOURCES += tst_qquickvisualdatamodel.cpp
include (../../shared/util.pri) include (../../shared/util.pri)
include (../shared/util.pri) include (../shared/util.pri)
testDataFiles.files = data TESTDATA = data/*
testDataFiles.path = .
DEPLOYMENT += testDataFiles
CONFIG += parallel_test CONFIG += parallel_test

4
tests/auto/quick/qquickxmllistmodel/qquickxmllistmodel.pro
View File

@ -6,9 +6,7 @@ SOURCES += tst_qquickxmllistmodel.cpp
include (../../shared/util.pri) include (../../shared/util.pri)
testDataFiles.files = data TESTDATA = data/*
testDataFiles.path = .
DEPLOYMENT += testDataFiles
CONFIG += parallel_test CONFIG += parallel_test

4
tests/auto/quick/rendernode/rendernode.pro
View File

@ -4,9 +4,7 @@ SOURCES += tst_rendernode.cpp
macx:CONFIG -= app_bundle macx:CONFIG -= app_bundle
testDataFiles.files = data TESTDATA = data/*
testDataFiles.path = .
DEPLOYMENT += testDataFiles
include(../../shared/util.pri) include(../../shared/util.pri)