From 3385fb91e1e55e1bfa1f78dfb8ce2e9f3fdaedef Mon Sep 17 00:00:00 2001 From: Rohan McGovern Date: Thu, 24 Nov 2011 10:36:10 +1000 Subject: Fixed installation of corelib tests In .pro files, removed wince/symbian-specific DEPLOYMENT cases and replaced them with TESTDATA where appropriate. In .cpp files, removed SRCDIR and relative paths to testdata and replaced them with the QFINDTESTDATA macro where appropriate. Modified test helper apps/libs to install themselves under the test they relate to. This change allows corelib tests to be correctly installed, along with their testdata, via `make install'. Change-Id: I5e202e2f3b577af7e39072d5c9fe13e0ca125304 Reviewed-by: Jason McDonald --- tests/auto/corelib/io/qdiriterator/tst_qdiriterator.cpp | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) (limited to 'tests/auto/corelib/io/qdiriterator/tst_qdiriterator.cpp') diff --git a/tests/auto/corelib/io/qdiriterator/tst_qdiriterator.cpp b/tests/auto/corelib/io/qdiriterator/tst_qdiriterator.cpp index eef504b90d..e331d09b64 100644 --- a/tests/auto/corelib/io/qdiriterator/tst_qdiriterator.cpp +++ b/tests/auto/corelib/io/qdiriterator/tst_qdiriterator.cpp @@ -66,10 +66,6 @@ class tst_QDirIterator : public QObject { Q_OBJECT -public: - tst_QDirIterator(); - virtual ~tst_QDirIterator(); - private: // convenience functions QStringList createdDirectories; QStringList createdFiles; @@ -106,6 +102,8 @@ private: // convenience functions } private slots: + void initTestCase(); + void cleanupTestCase(); void iterateRelativeDirectory_data(); void iterateRelativeDirectory(); void iterateResource_data(); @@ -124,8 +122,12 @@ private slots: void hiddenDirs_hiddenFiles(); }; -tst_QDirIterator::tst_QDirIterator() +void tst_QDirIterator::initTestCase() { + // chdir into testdata directory, then find testdata by relative paths. + QString testdata_dir = QFileInfo(QFINDTESTDATA("entrylist")).absolutePath(); + QVERIFY2(QDir::setCurrent(testdata_dir), qPrintable("Could not chdir to " + testdata_dir)); + QFile::remove("entrylist/entrylist1.lnk"); QFile::remove("entrylist/entrylist2.lnk"); QFile::remove("entrylist/entrylist3.lnk"); @@ -187,7 +189,7 @@ tst_QDirIterator::tst_QDirIterator() #endif } -tst_QDirIterator::~tst_QDirIterator() +void tst_QDirIterator::cleanupTestCase() { Q_FOREACH(QString fileName, createdFiles) QFile::remove(fileName); -- cgit v1.2.3