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/codecs/qtextcodec | |
| 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/codecs/qtextcodec')
| -rw-r--r-- | tests/benchmarks/corelib/codecs/qtextcodec/main.cpp | 8 | ||||
| -rw-r--r-- | tests/benchmarks/corelib/codecs/qtextcodec/qtextcodec.pro | 6 |
2 files changed, 7 insertions, 7 deletions
diff --git a/tests/benchmarks/corelib/codecs/qtextcodec/main.cpp b/tests/benchmarks/corelib/codecs/qtextcodec/main.cpp index f75848556c..7e546baa91 100644 --- a/tests/benchmarks/corelib/codecs/qtextcodec/main.cpp +++ b/tests/benchmarks/corelib/codecs/qtextcodec/main.cpp @@ -129,7 +129,9 @@ void tst_QTextCodec::fromUnicode_data() const void tst_QTextCodec::fromUnicode() const { QFETCH(QTextCodec*, codec); - 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; @@ -156,7 +158,9 @@ void tst_QTextCodec::toUnicode_data() const void tst_QTextCodec::toUnicode() const { QFETCH(QTextCodec*, codec); - 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); QVERIFY(file.open(QFile::ReadOnly)); QByteArray data = file.readAll(); const char *d = data.constData(); diff --git a/tests/benchmarks/corelib/codecs/qtextcodec/qtextcodec.pro b/tests/benchmarks/corelib/codecs/qtextcodec/qtextcodec.pro index c13c714543..5ee577c256 100644 --- a/tests/benchmarks/corelib/codecs/qtextcodec/qtextcodec.pro +++ b/tests/benchmarks/corelib/codecs/qtextcodec/qtextcodec.pro @@ -2,9 +2,5 @@ TARGET = tst_bench_qtextcodec QT = core testlib SOURCES += main.cpp -wince*:{ - DEFINES += SRCDIR=\\\"\\\" -} else { - DEFINES += SRCDIR=\\\"$$PWD/\\\" -} +TESTDATA = utf-8.txt |