diff options
author | Kurt Korbatits <kurt.korbatits@nokia.com> | 2012-03-12 14:24:02 +1000 |
---|---|---|
committer | Qt by Nokia <qt-info@nokia.com> | 2012-03-19 01:18:20 +0100 |
commit | 0f929bfa9aa76d7db54a62c6a571e97224384ec1 (patch) | |
tree | a816ba9a293ba7b56c91be4c3b85ea4e56013f1d /tests/benchmarks/corelib/tools/qstring | |
parent | 36513264daaa0748d32326421732b9e5f212c2b5 (diff) |
Fixed benchmarks to work from install directory
- Changed benchmarks to use TESTDATA and QFINDTESTDATA
- Fixed up targets all use tst_bench_ syntax
Change-Id: I5c2936702e248478f5df225ce38893158ee22d7f
Reviewed-by: Jason McDonald <jason.mcdonald@nokia.com>
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
Diffstat (limited to 'tests/benchmarks/corelib/tools/qstring')
-rw-r--r-- | tests/benchmarks/corelib/tools/qstring/main.cpp | 4 | ||||
-rw-r--r-- | tests/benchmarks/corelib/tools/qstring/qstring.pro | 6 |
2 files changed, 4 insertions, 6 deletions
diff --git a/tests/benchmarks/corelib/tools/qstring/main.cpp b/tests/benchmarks/corelib/tools/qstring/main.cpp index 9d5c43c290..9b10e97f2b 100644 --- a/tests/benchmarks/corelib/tools/qstring/main.cpp +++ b/tests/benchmarks/corelib/tools/qstring/main.cpp @@ -1408,7 +1408,9 @@ void tst_QString::ucstrncmp() const void tst_QString::fromUtf8() const { - QFile file(SRCDIR "utf-8.txt"); + QString testFile = QFINDTESTDATA("utf-8.txt"); + QVERIFY2(!testFile.isEmpty(), "cannot find test file utf-8.txt!"); + QFile file(testFile); if (!file.open(QFile::ReadOnly)) { qFatal("Cannot open input file"); return; diff --git a/tests/benchmarks/corelib/tools/qstring/qstring.pro b/tests/benchmarks/corelib/tools/qstring/qstring.pro index 72300de9da..cf2ee24c6d 100644 --- a/tests/benchmarks/corelib/tools/qstring/qstring.pro +++ b/tests/benchmarks/corelib/tools/qstring/qstring.pro @@ -3,11 +3,7 @@ QT -= gui QT += core-private testlib SOURCES += main.cpp data.cpp fromlatin1.cpp fromutf8.cpp -wince*:{ - DEFINES += SRCDIR=\\\"\\\" -} else { - DEFINES += SRCDIR=\\\"$$PWD/\\\" -} +TESTDATA = utf-8.txt sse4:QMAKE_CXXFLAGS += -msse4 else:ssse3:QMAKE_FLAGS += -mssse3 |